Merge "Remove zuul-cloner shim" into feature/zuulv3