Ebd 10245 consistency level

Fixes for EBD-10245 and EBD-10266 related to data consistency using CQL.
See also https://datastax-oss.atlassian.net/browse/JAVA-164