Merge "Don't store duplicate policies for server_group"