updating user permissions to include roles defined in ding_user_roles
Merge remote-tracking branch 'origin' into release