ACCUMULO-1505 - merging Ryan Leary's patch, with modifications to update and remove warnings



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