Fixing problem with RestoreRolesTransformer #469 for branch 2.2