Merge "[OOM] Update Cassandra in common with service account"