Merge "Remove unused repos from repo init" into feature/zuulv3