add doc of permissions argument to role update
Merge branch '1066022' into 2.4-release
Merge branch '2.4-testing' into 2.5-testing
Merge branch '2.5-testing' into 2.6-dev