svn merge -c1465121 from trunk

HDFS-4646. createNNProxyWithClientProtocol ignores configured timeout value. Contributed by Jagane Sundar



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