Porting onto hadoop-2.2.0