ACCUMULO-1505 - Applying Ryan Leary's patch



git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.4@1491900 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1505 - fixing up some warnings in the patch



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