Merge "[AAI] Add serviceAccount override to local cassandra config"