Bug 790361 - Updates to roles and capabilities