Merge "Split out Neutron ports client"