Fix dupes in DISTINCT queries on static cols w/ paging

Patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-8108
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk