Merge "Configure nova_cell1.conf to use placement for reschedules"