Fix error messages
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Export JVM_OPTS in debian init

Patch by Matt Robenolt, reviewed by Michael Shuler for CASSANDRA-7802
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	debian/init
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk