Merge "Fix exception in IPv6Service for non-neutron ports"