Merge !322: coverity fixes (nothing important)

5 jobs for master
in 77 minutes and 2 seconds and was queued for 3 seconds