Merge branch srettie-add-track-origin-selection with refs/heads/master into...

Merge branch srettie-add-track-origin-selection with refs/heads/master into refs/merge-requests/274/train
27 jobs for !274 with srettie-add-track-origin-selection into master in 9 minutes and 52 seconds (queued for 4 seconds)
merge train