[testing] tree: promote changes from testing-devel at e1e639630e0941012c3e0b5213d964e0b09f9574

[coreosbot-releng]

Triggered by @c4rt0 in https://github.com/coreos/fedora-coreos-streams/issues/963.