Make it compile with Hadoop CDH4

Needed when we want to use Hadoop CDH4 (2.0) mrv1/mrv2 over Cassandra

Conflicts:
	build.xml