ACCUMULO-1127 merged disabling of dot motion to 1.5 branch

git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1451762 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1127 merged mergeinfo to trunk

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