Add some additional mutually_exclusive decorators
Update unit tests including splitting two ambiguous tests
Fix copy-paste error in test_grant_roles and test_revoke_roles
[ci-skip]
Merge branch 'master' of github.com:plone/plone.api