Merge branch jabarr-coverage with refs/heads/master into refs/merge-requests/417/train

42 jobs for !417 with jabarr-coverage into master in 11 minutes and 39 seconds (queued for 2 seconds)
merge train