only query once for local host id on join

patch by dbrosius reviewed by jbellis for cassandra-7257
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
fix CFSTest on Windows
patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7195
Merge branch 'cassandra-2.1' into trunk
remove unused field 'severity'
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Fix cql3 reader when columns is reversed.

Patch by Alex Liu, reviewed by pkolackzk for CASSANDRA-7100
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Fix ConfigHelper.setInputColumnFamily with uppercased keyspace names.

Patch by Alex Liu, reviewed by pkolackzk for CASSANDRA-7093
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Change serialization format for UDT

patch by slebresne; reviewed by iamaleksey for CASSANDRA-7209
Merge branch 'cassandra-2.1' into trunk
Quote ks/cf names better.

Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-7093
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk