Merge fix from 4.1-dev for trq-1531: Job running in queue that is not started.