Merge branch '47-docker-and-trivy-jobs-can-t-be-used-in-merge-train-as-they-redefine-the-rules-for-their-own-jobs' into latest
