Merge "Configure nova's use of placement more correctly"