Changes to support with Accumulo 1.5.1 and Hadoop 2.0.