ACCUMULO-1348 merged patch to trunk

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1479211 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1367 Applying patch from Corey Nolet to make MAC a little more configurable.


git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1479227 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1336 Apply patch from Corey Nolet to add Typo "lexicoders" to Accumulo


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