ACCUMULO-1831 fix recovered log cleanup
Merge branch '1.6.0-SNAPSHOT'