Added customizable expiration time to Redis queue jobs
Fix conflicts.
Merge branch '4.2'