svn merge -c 1587608 FIXES: HADOOP-10498. Add support for proxy server. (daryn)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587609 13f79535-47bb-0310-9956-ffa450edef68