Warn when timestamps are provided on CAS batch

patch by slebresne; reviewed by iamaleksey for CASSANDRA-7067
Remove duplicate entries in changelog
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt