svn merge -c 1415480 from trunk for HDFS-4242. Map.Entry is incorrectly used in LeaseManager since the behavior of it is undefined after the iteration or modifications of the map.