LPS-36303 Add check to SourceFormatter
LPS-36303 Sort
LPS-36401 The link to the Control Panel in the dockbar must appear exclusively when the user has the "Go to Control Panel" permission
LPS-36401 The permission check to view a layout of the control panel should also take into account the control panel category. Otherwise a user with proper permissions will not be able to access "My Account" or "Site Administration" unless he has "Go to Control Panel" permission.

This was most probably also an issue in 6.1, although I'm not sure if it's worth trying to backport this fix.
LPS-36280 Add new action VIEW_SITE_ADMINISTRATION
LPS-36280 Replace complex and expensive check to show the site administration with a check for the VIEW_SITE_ADMINISTRATION permission
LPS-36280 Remove the property "dockbar.show.site.content.icon" because it is no longer needed.

I've doubled checked this with @mhan810
This commit also contains some minor source formatting in ServicePreAction
LPS-36280 The Power User role must provide access to the Site Administration of the personal site by default
LPS-36280 Add code in the verifier to add the permission to existing Power User roles. We check for the MANAGE_LAYOUTS permission and consider that if it has been removed from the role we should not add the permission to go to the site administration.
LPS-36280 SF
LPS-36418 Counter activities are not under transaction protection
LPS-36418 SF
LPS-34648 Prevent NPE when upgrading inconsistent databases
LPS-34648 SF