Clean up of the cinder roles

These are lumped into one PR as they all deal with cinder roles. Individual commits have descriptions of the changes.