svn merge -c 1374127 from trunk for HDFS-2421. Improve the concurrency of SerialNumberMap in NameNode.