Merge "Add migration tool for v2 to v3 conversion" into feature/zuulv3