Merge "[PORTAL] Make Portal use generic Cassandra image"