Pulled in some v2.5 patches to fix two scheduling bugs

The bugs fixed were:
- The time limit of backfilled jobs would be reduced to 1 minute
- Standby jobs would not be scheduled if their time limit would delay the
  start of a higher priority job