Merge "Remove 'allow_port_security_disabled' option"