Merge "Neutron: Do not set removed allow_overlapping_ips"