Add missing role and update allowRolesToAddKeywords
This refs affinitic #6068