ACCUMULO-259 - merged up to 1438309


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