Merge "Remove unnecesarry code in PortsAdminExtendedAttrsTest"