Merge "Configure [neutron] in nova_cell*.conf"