Add latest changes from gitlab-org/gitlab@master

spec/lib/gitlab/gitaly_client/cleanup_service_spec.rb

@@ -9,6 +9,10 @@ describe Gitlab::GitalyClient::CleanupService do
   let(:client) { described_class.new(project.repository) }
 
   describe '#apply_bfg_object_map_stream' do
+    before do
+      ::Gitlab::GitalyClient.clear_stubs!
+    end
+
     it 'sends an apply_bfg_object_map_stream message' do
       expect_next_instance_of(Gitaly::CleanupService::Stub) do |instance|
         expect(instance).to receive(:apply_bfg_object_map_stream)