Merge "Upgrade AAI to use common shared Cassandra"