LPS-42864 support for their own logo in organizations
LPS-42864 reuse code in other services
LPS-42727 autogenerated
LPS-42727 SF
Test Fixes - CPSites - macros
Test Fixes - CPSites SF
Test Fixes - CPSites SF
Revert "LPS-42524 NoSuchLayoutException when a page created from site template no longer exists in site template."

This reverts commit e237bf2e959da31b62c069f331cf24ccea63a138.
Merge branch 'master' of github.com:liferay/liferay-portal