ACCUMULO-1685 noticed a double-slash in computed file names
ACCUMULO-1707 applying Steve's patch
ACCUMULO-1707 applying Steve's patch