ACCUMULO-609 - tested and applying patch by Chris McCubbin



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