Fix prepared BATCH statements with batch-level timestamps

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-5415
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java