Backported changes done for openSUSE in Build Service

- These changes are already in openSUSE:Factory
- Made by openSUSE release manager