Merge "Drop keystone dedicated ports"