Sync with devops changes

Paal Kvammerequested to merge
kvamme62/devops into master

Devops tweaks for our on-prem builds. May or may not be useful for others.

Merge request reports