Add support for mcp:CI_Organisation without role - role is added separately
Merge remote-tracking branch 'upstream/2.10.x+angulareditor' into 2.10.x+angulareditor