Reject counters inside user types

patch by Aleksey Yeschenko; tested by Russ Hatch; reviewed by Jonathan
Ellis for CASSANDRA-7672
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Update versions for 2.1.0-rc5 release
(cqlsh) Removed unused code for build number parsing

patch by Mikhail Stepura; reviewed by  Jonathan Ellis for CASSANDRA-7524
Merge branch 'cassandra-2.1' into trunk
simplify charset handling
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
review results 2014-08-01
Merge remote-tracking branch 'origin/trunk' into 7395
Merge branch '7395' into 7562-udf-java

Conflicts:
	src/java/org/apache/cassandra/cql3/udf/UDFunction.java