Merge "Add config option to create networks with port_security_enabled"