Merge branch 'celluloid_update' of /home/git/repositories/gitlab/gitlabhq into 5-4-stable
Fix for Resque forking might cause stuck workers for the threaded Sidekiq.