Resolve "Merge "User" and "User (with overlays)" roles into one, named "User""

Placeholder Piotr Gawronrequested to merge
1658-merge-user-and-user-with-overlays-roles-into-one-named-user into master

Closes #1658 (closed)

Edited by Placeholder Piotr Gawron

Merge request reports