Fix preparing statement with batch and delete from collection

patch by Jan Chochol; reviewed by slebresne for CASSANDRA-6607
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
Merge branch 'cassandra-2.0' into trunk