FALCON-382 Error While building Latest trunk code with Hadoop 2.2.0. Contributed by Suhas Vasu