Merge "Resolve openSUSE devstack failures"