Merge "Work around hhvm bug in redis job queue"