HADOOP-10563. Fix bad merge which messed up hadoop-common/CHANGES.txt.
HADOOP-10563. Fix bad merge which messed up hadoop-common/CHANGES.txt.

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