Merge "Partial revert "Deferring low and min priority jobs when quota is low."" into tm-dev