ACCUMULO-259 - merging up to 1438335



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