hg: jdk7/tl/jdk: 6896297: (rmi) fix ConcurrentModificationException causing TCK failure