Take some cassandra store cpp-common updates