Don't drop local mutations without a trace

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

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