ACCUMULO-1118 merged shelltest fix to 1.5 branch

git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1464092 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1118 merge prop changes back to trunk

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