Update versions and license for 1.2.3
r/m unused code
Fix race when opening ColumnFamilyStore; patch by yukim reviewed by jbellis for CASSANDRA-5350
Merge branch 'cassandra-1.1' into cassandra-1.2

Conflicts:
	src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java
Merge branch 'cassandra-1.2' into trunk
synchronize getLevelSize
fix off-by-one
Fix mixing prepared statements between keyspaces

patch by David Sauer; reviewed by slebresne for CASSANDRA-5352
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	CHANGES.txt
Fix the consistencylevel during bootstrap fix

patch by slebresne; reviewed by jbellis for CASSANDRA-5354
comment
move too-large-for-segment check into LogRecordAdder, saving a redundant serializedSize computation
Fix the consistencylevel during bootstrap fix

patch by slebresne; reviewed by jbellis for CASSANDRA-5354
move too-large-for-segment check into LogRecordAdder, saving a redundant serializedSize computation
Fix missing import
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	CHANGES.txt
CHANGES
Fix transposed arguments in AlreadyExistsException (CASSANDRA-5362)
Merge branch 'cassandra-1.2' into trunk
Fix nodetool ring and status output format for ipv6 addresses
Patch by Michal Michalsky, reviewed by brandonwilliams for
CASSANDRA-5302