Use timestamp from the statement instead of "now"

patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for CASSANDRA-7053
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt