Merge branch 'cassandra-3.11' into trunk

# Conflicts:
#	CHANGES.txt
#	src/java/org/apache/cassandra/db/DataRange.java