fix merge-created bad map key lookup type
fix countAllBatches query
patch by Lyuben Todorov; reviewed by jbellis for CASSANDRA-7300
cqlsh: always emphasize the partition key in DESC output

patch by Patrick McFadin; reviewed by Aleksey Yeschenko for
CASSANDRA-7274
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	bin/cqlsh
Properly decode UDTs with nulls in cqlsh

patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for CASSANDRA-7289
don't NPE shutting down, due to gossip failure
Merge branch 'cassandra-2.0' into cassandra-2.1
Copy compaction options to make sure they are reloaded.

Patch by pauloricardomg; reviewed by marcuse for CASSANDRA-7290
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Add option to do more aggressive tombstone compaction.

Patch by pauloricardomg; reviewed by marcuse for CASSANDRA-6563
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
fix typo
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
Merge branch 'cassandra-2.0' into cassandra-2.1
Make sure we don't try to compact already compacting sstables in HHOM

Patch by marcuse; reviewed by jbellis for CASSANDRA-7288
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
xmx
explain how to specify a keyspace
Merge branch 'cassandra-2.0' into cassandra-2.1
emphasize using sstablerepairedset with LCS