ACCUMULO-1237 minimized 1.4 and 1.5 proxy diffs and fixed a few proxy issues

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