Merge "Upgrade SDC to use common Cassandra Cluster"