LPS-43587 Un-revert original commits
LPS-43587 - Adds pre-url content to stringbundler
LPS-43587 - Adds additional test cases
LPS-43587 SF
LPS-48370 UpgradeLayout is missing from UpgradeProcess_6_0_0
LPS-48398 create the annotation
LPS-48398 teach the module framework to read the annotation
LPS-48379 first, remove the legacy
LPS-48379 add missing beans
LPS-48379 teach the beans to declare their properties
LPS-48379 javadoc
LPS-48379 as used
LPS-48379 Jim, please readd. Ray's notes are very informative
LPS-48379 Make them public
LPS-48379 Sort
LPS-48379 Not needed
LPS-48379 SF
Revert "LPS-48318 - tests"

This reverts commit 144e9cea74fd3eb816e23878722b533ad5353533.
Revert "LPS-48317 Change functional tests to add portlets to the column on the right"

This reverts commit 68b02b2ad386e4d3f58119c2b3a2c14429dee0ef.
LPS-48130 Add missing resource and portlet permissions configuration for DM-admin Bookmerks-admin and Shopping-admin