Merge "Update Roles and fix Cassandra race cond."