Merge "Make test test_remove_associated_ports to be compatible with L3HA"