ACCUMULO-259 Merging up to 1438309



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