ACCUMULO-3085 Fix log message
Merge branch '1.5' into 1.6

Conflicts:
	server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
Merge branch '1.6'