ACCUMULO-2617 Fix the locationByProgram to account for the extra 'bin' directory
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT'