HDFS-5065. Merging change r1537319 from trunk to branch-2.
HDFS-5065. Merging change r1537319 from trunk to branch-2.

git-svn-id: 87fadc70c6d1ec4cad1ab866a1bdcf2d7235de87@1537320 13f79535-47bb-0310-9956-ffa450edef68

mix/hadoop,jokes000/hadoop,an3m0na/hadoop,MjAbuz/hadoop,Microsoft-CISL/hadoop-prototype,satishpatil2k13/ODPI-Hadoop,zrccxyb62/hadoop,jokes000/hadoop,hasonhai/hadoop,huiyi-learning/hadoop,an3m0na/hadoop,zrccxyb62/hadoop,satishpatil2k13/ODPI-Hadoop,huiyi-learning/hadoop,myeoje/PhillyYarn,satishpatil2k13/ODPI-Hadoop,Microsoft-CISL/hadoop-prototype,mix/hadoop,zjshen/hadoop-in-docker,satishpatil2k13/ODPI-Hadoop,huiyi-learning/hadoop,an3m0na/hadoop,mix/hadoop,hasonhai/hadoop,Microsoft-CISL/hadoop-prototype,jokes000/hadoop,mix/hadoop,zjshen/hadoop-in-docker,an3m0na/hadoop,myeoje/PhillyYarn,hasonhai/hadoop,Microsoft-CISL/hadoop-prototype,hasonhai/hadoop,zrccxyb62/hadoop,satishpatil2k13/ODPI-Hadoop,myeoje/PhillyYarn,mix/hadoop,jokes000/hadoop,hasonhai/hadoop,MjAbuz/hadoop,jokes000/hadoop,zjshen/hadoop-in-docker,an3m0na/hadoop,zrccxyb62/hadoop,Microsoft-CISL/hadoop-prototype,zjshen/hadoop-in-docker,MjAbuz/hadoop,zjshen/hadoop-in-docker,intel-hadoop/hadoop,Microsoft-CISL/hadoop-prototype,huiyi-learning/hadoop,intel-hadoop/hadoop,zjshen/hadoop-in-docker,mix/hadoop,huiyi-learning/hadoop,mix/hadoop,intel-hadoop/hadoop,Microsoft-CISL/hadoop-prototype,zjshen/hadoop-in-docker,myeoje/PhillyYarn,satishpatil2k13/ODPI-Hadoop,intel-hadoop/hadoop,satishpatil2k13/ODPI-Hadoop,zrccxyb62/hadoop,jokes000/hadoop,an3m0na/hadoop,an3m0na/hadoop,MjAbuz/hadoop,zrccxyb62/hadoop,hasonhai/hadoop,zrccxyb62/hadoop,an3m0na/hadoop,MjAbuz/hadoop,hasonhai/hadoop,jokes000/hadoop,myeoje/PhillyYarn,myeoje/PhillyYarn,huiyi-learning/hadoop,intel-hadoop/hadoop,huiyi-learning/hadoop,zjshen/hadoop-in-docker,myeoje/PhillyYarn,satishpatil2k13/ODPI-Hadoop,mix/hadoop,MjAbuz/hadoop,myeoje/PhillyYarn,hasonhai/hadoop,MjAbuz/hadoop,intel-hadoop/hadoop,huiyi-learning/hadoop,intel-hadoop/hadoop,Microsoft-CISL/hadoop-prototype,jokes000/hadoop