Merge "Re-Add ceilometer expirer to roles_data"