HDFS-5139. Merge r1525665 from trunk to branch-2
HDFS-5139. Merge r1525665 from trunk to branch-2

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

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