Moving HDFS-3961 change from release 1.1 to 1.2
Moving HDFS-3961 change from release 1.1 to 1.2

git-svn-id: 68840cca9c4532603a19859f2a2ff9d7d8a9b06d@1388186 13f79535-47bb-0310-9956-ffa450edef68

ShortMap/ShortMap,ShortMap/ShortMap,ShortMap/ShortMap,ShortMap/ShortMap,ShortMap/ShortMap,ShortMap/ShortMap,ShortMap/ShortMap,ShortMap/ShortMap,ShortMap/ShortMap