ACCUMULO-1173 reverting setting thread state

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




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