Prep for 2.1.2
Fix News.txt
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	NEWS.txt
	build.xml