Fix potential out of bounds exception during paging

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6333
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	CHANGES.txt