Merge "leave port_security_enabled undefined by default"