re-commit of HADOOP-11881
re-commit of HADOOP-11881

intel-hadoop/hadoop,Microsoft-CISL/hadoop-prototype,intel-hadoop/hadoop,zrccxyb62/hadoop,zrccxyb62/hadoop,Microsoft-CISL/hadoop-prototype,Microsoft-CISL/hadoop-prototype,intel-hadoop/hadoop,MjAbuz/hadoop,MjAbuz/hadoop,satishpatil2k13/ODPI-Hadoop,intel-hadoop/hadoop,MjAbuz/hadoop,zrccxyb62/hadoop,satishpatil2k13/ODPI-Hadoop,satishpatil2k13/ODPI-Hadoop,satishpatil2k13/ODPI-Hadoop,Microsoft-CISL/hadoop-prototype,MjAbuz/hadoop,zrccxyb62/hadoop,satishpatil2k13/ODPI-Hadoop,zrccxyb62/hadoop,zrccxyb62/hadoop,satishpatil2k13/ODPI-Hadoop,satishpatil2k13/ODPI-Hadoop,satishpatil2k13/ODPI-Hadoop,Microsoft-CISL/hadoop-prototype,intel-hadoop/hadoop,Microsoft-CISL/hadoop-prototype,intel-hadoop/hadoop,MjAbuz/hadoop,Microsoft-CISL/hadoop-prototype,intel-hadoop/hadoop,MjAbuz/hadoop,MjAbuz/hadoop,zrccxyb62/hadoop,Microsoft-CISL/hadoop-prototype