Added the merging of two roles.
This is not 100% effective in all cases; some user assembly may be required.
Mostly that will be cleaning up left-over stuff and deleting some duplicated stuff.