Merge "Remove internal helper _default_security_group"