Merge "Reset merger repo when performing an update" into feature/zuulv3