Complete #48: Migrate Role Claims

To ease upgrading to vNext, migrate claims so behaviour is roughly the
same.