Merge branch 'oslo-updates' into dt-test
Merge branch 'test-clientmanager' into dt-test