Changes for hadoop-2.0.3