YARN-2189. Admin service for cache manager. Addendum to fix merge conflicts
YARN-2189. Admin service for cache manager. Addendum to fix merge conflicts

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