Merge "Do not remove server_groups from default_quota_set"