Merge branch 'nova-config-cleanup' into dt-test
Merge branch 'database-service' into dt-test