reorder to avoid NPE
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
added java source UDFs
Merge remote-tracking branch 'origin/trunk' into 7395