Merge branch '300123-several-job-timeouts-this-morning-for-rspec-unit-pg11-11-20' into 'master'

Fix pages migration deadlock

See merge request gitlab-org/gitlab!52677

app/services/pages/migrate_from_legacy_storage_service.rb

@@ -24,7 +24,9 @@ module Pages
       @queue.close
 
       @logger.info("Waiting for threads to finish...")
+      ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
         threads.each(&:join)
+      end
 
       { migrated: @migrated, errored: @errored }
     end