Merge "Migrate controller matrix-verify jobs to freestyle-verify jobs"