ACCUMULO-1.5.1-SNAPSHOT need to store location without full path
Merge branch '1.5.1-SNAPSHOT'