Fix PRSI handling of CQL3 row markers for row cleanup

patch by Berenguer Blasi; reviewed by Aleksey Yeschenko for
CASSANDRA-7787
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Verify that UDF class methods are static

Patch by Tyler Hobbs; review by Robert Stupp for CASSANDRA-7781
Throw IRE for relations on entire collections

Patch by Tyler Hobbs; review by Sylvain Lebresne for CASSANDRA-7506
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
cqlsh: fix COPY FROM handling of null/empty PK values

Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7792
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
(cqlsh) COPY TO/FROM improvements

patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7405
Merge branch 'cassandra-2.1' into trunk
Merge remote-tracking branch 'origin/trunk' into 7562-udf-java