Merge "Put legacy jobs down a directory level into workspace" into feature/zuulv3