Provide the correct QueryOptions when buildind CAS resultset
Merge branch 'cassandra-2.1' into trunk