Roles/Caps cleanup while working to resolve websharks/s2member#206