minor reversion patches
fixed updating roles
Merge branch 'develop' into json_xml