CMS-4606 Content Permissions - Changes to Security step

Fixed various selection bugs.