Merge "Fix test_port_security_macspoofing_port" into mcp/caracal