LPS-50091 - paths
LPS-50091 - macros
LPS-50091 - tests
LPS-50091 SF

Conflicts:
	portal-web/test/functional/com/liferay/portalweb2/enduser/wcm/contenttargeting/usecase/ContentTargetingUsecase.testcase
LPS-50091 SF