ACCUMULO-1267 Record only merge from 1.4 onto trunk


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