Fix paging discardFirst IllgalArgumentException

patch by slebresne; reviewed by thobbs for CASSANDRA-6555
Merge branch 'cassandra-2.0' into trunk