Add in forgotten MX4J variables to cassandra-env.sh

patch by Lewis John McGibbney; reviewed by Mikhail Stepura for CASSANDRA-6518
Merge branch 'cassandra-2.1' into trunk
use parameterized logging
Properly use the paxos consistency for (non-protocol) batches

patch by slebresne; reviewed by jbellis for CASSANDRA-6837
Update copyright date in NOTICE file
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk
Fix typo
Merge branch 'cassandra-2.1' into trunk