Merge branch 'nova-api-revert' into dt-test
Merge branch 'openrc-stackenv' into dt-test
Merge branch 'more-setup' into dt-test