Avoid site outages due to broken job queues

Change-Id: I71f1bef886850679812e23b8a49fc9b80d9b6102
Merge "Avoid site outages due to broken job queues"