I missed some merge info somewhere



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