ACCUMULO-1267 record only merge from 1.4 onto 1.5


git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1499201 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1552 applying Jonathan Hsieh's patch to fix the typo

git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1500719 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1552 applying Jonathan Hsieh's patch to fix the typo

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