Merge "Restrict database access to nova-compute in singleconductor mode"