ACCUMULO-1237 Applying patch from Corey Nolet that minimizes diffs between the proxy in 1.4 and 1.5.

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