Fix IncompatibleClassChangeError from hadoop2

Patch by Mariusz Kryński, reviewed by brandonwilliams for CASSANDRA-7229
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Remove CPRR/CPIF.

Patch by brandonwilliams for CASSANDRA-7570
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java