fix references to defunct CqlPagingInputFormat
patch by rjoshi reviewed by dbrosius for CASSANDRA-8541
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk