Merge "Marking job deferral time in QuotaController." into qt-dev