Merge "Remove unused mergeChangeQueue method" into feature/zuulv3