Merge branch 'ce-4813-quickfix' into 'master'

Resolve "spec/ee/spec/services/ee/projects/destroy_service_spec.rb is failing"

See merge request gitlab-org/gitlab-ce!16955

spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb

@@ -8,7 +8,7 @@ describe Gitlab::BackgroundMigration::PopulateMergeRequestMetricsWithEventsData,
   end
 
   after do
-    [MergeRequest, MergeRequestDiff].each(&:reset_column_information)
+    [Project, MergeRequest, MergeRequestDiff].each(&:reset_column_information)
   end
 
   describe '#perform' do