LPS-42956 Use the full portletId to find the correct column when adding pre-configured portlets to a layout with customizable and non-customizable columns
LPS-42956 Source Formatting
LPS-42956 Source formatting - use single for loop
LPS-42956 The last part of a var should designate what it is.
Revert "LPS-42794 - Source formatting"

This reverts commit ea9bb7dad23d48b03abe3c9a65e869f54a661419.
LPS-42317
Test Fixes - CPRolesCPSites - macros
LPS-42897 - actions, paths
LPS-42897 - macros
LPS-42897 - tests
LPS-42685 Test