Merge "Add new test for job timing out while work is enqueued." into oc-dev