ACCUMULO-2028 avoid NPE during a table delete when balancing
Merge branch '1.6.0-SNAPSHOT'