Merge "Remove old buildsets" into feature/zuulv3