Merge remote-tracking branch 'origin/system_9_2_security_test_for_ce_to_ee'...

Merge remote-tracking branch 'origin/system_9_2_security_test_for_ce_to_ee' into 9-2-5-security-update-master

spec/helpers/groups_helper_spec.rb

@@ -29,7 +29,7 @@ describe GroupsHelper do
       it 'returns an url for the avatar pointing to the primary node base url' do
         group.avatar = fixture_file_upload(avatar_file_path)
         group.save!
-        expect(group_icon(group.path).to_s).to match("#{geo_url}/uploads/group/avatar/#{group.id}/banana_sample.gif")
+        expect(group_icon(group.path).to_s).to match("#{geo_url}/uploads/system/group/avatar/#{group.id}/banana_sample.gif")
       end
 
       it 'gives default avatar_icon when no avatar is present' do