ENG-4524 Get rid of temporary changes to CopyOnWriteIterator.h