ACCUMULO-3010 cherry-picked to 1.6
Merge branch '1.6.1-SNAPSHOT'

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