Adjustments to the previous commit

To sync with the changes introduced in the second commit on
https://github.com/openSUSE/open-build-service/pull/725