Support Cassandra String based partition keys

Fix for #1518 and #1591
Formatting: method arguments should either be all on one line or each on a separate line.