Added customizable expiration time to Redis queue jobs
Fix conflicts.