Merge remote-tracking branch 'origin/trunk' into 8053-udaf-v2

Conflicts:
	src/java/org/apache/cassandra/cql3/functions/Functions.java
	src/java/org/apache/cassandra/cql3/functions/JavaSourceUDFFactory.java
	src/java/org/apache/cassandra/cql3/functions/UDFunction.java
	src/java/org/apache/cassandra/cql3/statements/CreateFunctionStatement.java