Merge branch feature/jorgen.lind/centos7fixup with refs/heads/master into...

Merge branch feature/jorgen.lind/centos7fixup with refs/heads/master into refs/merge-requests/246/train
3 jobs for !246 with feature/jorgen.lind/centos7fixup into master in 6 minutes and 12 seconds
merge train