Adding Billing Administrator and Purchaser roles

These roles are required for the Store release

@olegrise Please review. Previously I've deployed these changes manually, as needed, but apparently they should just go in now, so I've rebased this branch that @alex-deaconu originally created.
@stevesherrie I'd rather prefer you restore the old logic for now so we know it's correct.