Executing "Clean Up Permissions" twice removes Add to Page permissions for User role

Reproduced on:
Tomcat 7.0.27 + MySQL 5. Portal 6.1.x EE GIT ID: 0194e5337a7371291163a76a24d98f2417adaa27.

Executing clean up permissions twice still removes add to page permissions for the user.

There are two problems here.

1. The documentation is not consistent with the implementation, i.e. The user hint indicates that "This process removes the assignment of some permissions on the Guest, User and Power User roles in order to simplify the management of "User Customizable Pages". Notably, "Add To Page" permissions is removed from the Guest, and User role for all portlets. Likewise the same permission is reduced in scope for Power Users from portal wide to scoped to "User Personal Site"." However, the implementation removes "Add To Page" from the Guest and Power User roles on the first execution and from the User on the second execution as described above. Either the implementation or the documentation are incorrect. The correction for this would need to be made in com.liferay.portlet.admin.util.CleanUpPermissionsUtil._cleanUpAddToPagePermissions_6
2. The logic in the com.liferay.portlet.admin.util.CleanUpPermissionsUtil class is incorrect causing the deletion of "Add To Page" for the User role if executed more than once. In particular the _cleanUpAddToPagePermissions_6 method should probably be changed from

			if (!limitScope ||
				groupIdString.equals(resourcePermission.getPrimKey())) {

				continue;
			}

to

			if (!limitScope) {

				continue;
			}

PASSED Manual Testing following the steps in the description.

Fixed on:
Tomcat 7.0.34 + MySQL 5. Portal 6.2.x GIT ID: 0ab7738c6241c8a1431aa66bcd704d20cedcb3b4.

Executing clean up permissions once is consistent with what the blurb says it will do. Executing it a second time doesn't change anything.