Merge "Fix Neutron region in nova.conf"