svn merge -c 1509565 from trunk for HDFS-5028. LeaseRenewer throws ConcurrentModificationException when timeout.


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