Merge "Fix aai-cassandra service"