Merge "Add server_group in default_quota_set"