Merge "Remove unused merger:update task" into feature/zuulv3