Merge remote-tracking branch 'remotes/berrange-gitlab/tags/misc-fixes-pull-request...