ACCUMULO-3011 correct for full filename references
Merge branch '1.6.1-SNAPSHOT'