SERV-2338 synchronized resque repo with master

All test passes.
Launched a resque job to be sure everything was running properly.