When adding an "Access in Control Panel" permission to an organization or site role, it also adds "Go to Control Panel" which is wrong

• Type: Bug
• Status: Closed
• Resolution: Fixed
• Affects Version/s: 6.2.0 CE RC5, 7.0.0 M3
• Fix Version/s: 7.0.0 M5
• Component/s: User Management, User Management > Roles
• Labels: None
• Environment: Tomcat 7 + MySQL 5. Portal 6.2.x GIT ID: 613c21f0863652219fe7982db703c77b3d268ab3.
• Story Points: 6
• Fix Priority: 4
• Git Pull Request: https://github.com/brianchandotcom/liferay-portal/pull/24748

Steps to reproduce:

1. Add an organization role (Test Org Role)
2. Define Permissions for Test Org Role > Users and Organizations > Flag Access in Control Panel

Actual result:
In addition to the selected permission, it automatically adds "Go to Control Panel", which doesn't make sense for an organization or site role since it's out of its scope and thus is not honored.

Expected result:
It should not automatically add "Got to Control Panel"