ACCUMULO-3011 correct for full filename references
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-2615 WARNING clean-up
ACCUMULO-2615 WARNING clean-up
ACCUMULO-2615 WARNING clean-up
ACCUMULO-2615 WARNING clean-up
ACCUMULO-2615 WARNING clean-up
ACCUMULO-2615 WARNING clean-up, removed import wildcards
ACCUMULO-2615 WARNING clean-up
ACCUMULO-2037 WARNING cleanup
ACCUMULO-2615 WARNING clean-up
ACCUMULO-2615 WARNING cleanup
ACCUMULO-3010 do not perform a merge when saving memory during a tablet load