Import gitlab-ci fix

Merged Paul Cammish requested to merge gitlab-ci-fix into stretch

Merge request reports