Merge "Revert "Resolve openSUSE devstack failures""