Allow specifying custom secondary index options in CQL3

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6480
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
CF id is now non-deterministic

and data dir/key cache are also unique per CF id.
patch by yukim; reviewed by Pavel Yaskevich for CASSANDRA-5202
Make user types keyspace scoped

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6438
Secondary indexing of map keys

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6383
Fix execution of LOCAL_QUORUM queries with SimpleStrategy

patch by alexliu68; reviewed by slebresne for CASSANDRA-6545
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/db/ConsistencyLevel.java
Wait for gossip to settle before accepting client connections
patch by Chris Burroughs; reviewed by Tyler Hobbs and jbellis for CASSANDRA-4288
merge from 2.0
1.2 nodes show 2.0 nodes as up when upgrading.
Patch by brandonwilliams, reviewed by Tyler Hobbs for CASSANDRA-6554
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/gms/Gossiper.java
Fix logback config in scripts and packaging.
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-6530
Ninja fix simple bugs from #6438
refactor nodetool, encapsulating each command into a subclass
patch by Clément Lardeur; reviewed by Mikhail Stepura for CASSANDRA-6381
Don't update system table for unknown nodes/dead states
Patch by Tyler Hobbs, reviewed by brandonwilliams for CASSANDRA-6053
Merge branch 'cassandra-1.2' into cassandra-2.0
Don't update system table for unknown nodes/dead states
Patch by Tyler Hobbs, reviewed by brandonwilliams for CASSANDRA-6053
Merge branch 'cassandra-2.0' into trunk
make isDeadState public
Merge branch 'cassandra-1.2' into cassandra-2.0