Merge branch 'kresd-exits' into 'master'

fixes for situations when a resolver exits (or hangs) at unforseen times

See merge request !145
10 jobs for master
in 3 minutes and 7 seconds and was queued for 7 seconds