Fix mixing prepared statements between keyspaces

patch by David Sauer; reviewed by slebresne for CASSANDRA-5352
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	CHANGES.txt