fix npe when specifying -Dcassandra.fd_initial_value_ms

patch by dbrosius reviewed by bwilliams for cassandra 6751
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 message spilleng
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
quell all the 'internal proprietary API' warnings induced by Unsafe and friends
Add ability to set/get logging levels to nodetool
patch by Jackson Chung reviewed by Vijay for CASSANDRA-6751
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
	src/java/org/apache/cassandra/tools/NodeCmd.java
	src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
Merge branch 'cassandra-2.1' into trunk
Push more of memtable data off-heap

patch by benedict & xedin; reviewed by benedict, iamaleksey & xedin for CASSANDRA-6694
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql/QueryProcessor.java
Mention 6694 in changelog
Optimize cellname comparison

patch by benedict; reviewed by slebresne for CASSANDRA-6934
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/utils/btree/Path.java
Allow overriding cassandra-rackdc.properties location

Patch by Patrick Ziegler, reviewed by brandonwilliams for CASSANDRA-7072
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/locator/SnitchProperties.java
Merge branch 'cassandra-2.1' into trunk
working off 2.0.6 w/powershell modifications since trunk's wonky.