Miscellaneous fixes to the Continuous Integration

Merged Darryl Green requested to merge github/fork/CJKay/master into master

Created by: CJKay

Merge request reports