Fixes system settings role issues.
Merge branch '2.1final' into qa