ACCUMULO-1173 reverting setting thread state

git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1455984 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1159 - Fixes exception on all token prompts



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