ACCUMULO-804 applied fixes to changes that broke compilation against hadoop 2.0

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1431056 13f79535-47bb-0310-9956-ffa450edef68