ACCUMULO-2974 Hadoop's StringUtils changes across 1 and 2, so switch it to commons-lang
Merge branch '1.6.1-SNAPSHOT'