LPS-46655 - macros

Conflicts:
	portal-web/test/functional/com/liferay/portalweb2/util/block/macro/SiteTemplates.macro
LPS-46655 - tests

Conflicts:
	portal-web/test/functional/com/liferay/portalweb2/enduser/wcm/sitesadministration/usecase/SitesadministrationUsecase.testcase
LPS-46655 - paths
LPS-46655 SF