Add better handling of deadlocks in DbScheduler#15

Xnopyt merged 2 commits intophlib:2.x.xphlib/jobqueue:2.x.xfrom

Xnopyt:dbscheduler-deadlockXnopyt/jobqueue:dbscheduler-deadlockCopy head branch name to clipboard