Fix prepared statement for protocol v2

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6035
Merge branch 'cassandra-2.0' into trunk