ACCUMULO-3406 fix filename parsing
Merge branch '1.6'