HADOOP-9503. Remove sleep between IPC client connect timeouts.  Contributed by Varun Sharma


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1475959 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4757. Update FSDirectory#inodeMap when replacing an INodeDirectory while setting quota.  Contributed by Jing Zhao


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