Use $CASSANDRA_HOME for default paths instead of /var

Patch by Tyler Hobbs; reviewed by Brandon Williams and Joshua McKenzie
for CASSANDRA-7136
Merge branch 'cassandra-2.1' into trunk
Fix rare potential NPE in HHOM page size calculation

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-7354
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk
Fix CASSANDRA-7354 CHANGES.txt entry
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk
update netty-all license
Merge branch 'cassandra-2.1' into trunk
fix logging context
Merge branch 'cassandra-2.1' into trunk
Reduce likelihood of contention on local paxos state locking

Patch by Aleksey Yeschenko; reviewed by Benedict Elliott Smith for CASSANDRA-7359
Merge branch 'cassandra-2.1' into trunk
CASSANDRA-7359 CHANGES.txt
Merge branch 'cassandra-2.1' into trunk
suggest cassandra-tools package
Merge branch 'cassandra-2.1' into trunk