Merge "Remove main.yaml" into feature/zuulv3