Fix NPE in cas operations

patch by slebresne; reviewed by jbellis for CASSANDRA-5925
Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk