ACCUMULO-1628 made InMemoryMap iterator deepCopy work after delete
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java