Added support for Hadoop 2.5.2 and 2.6.0