ACCUMULO-1679 - removing TFile and Chunk
Merge branch '1.6.0-SNAPSHOT'