Issue #3620897: Cleaning the config after deleting a role

Oleksandr Antonchykrequested to merge
issue/shortcutperrole-3620897:3620897-cleaning-the-config into 2.1.x

Closes #3620897

Merge request reports