ACCUMULO-974 - Applying Tim Reardon's patch for Mock



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