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
LPS-46789 - Add sikuliAssertElementPresent and sikuliAssertElementNotPresent methods
LPS-46789 - Update Sikuli Smoke test to include sikuliAssertElementPresent and sikuliAssertElementNotPresent
LPS-46789 SF
LPS-46789 SF
LPS-46802 - Consolidate 'build-test-tomcat-*.xml'
LPS-46435 - paths
LPS-46435 - macros
LPS-46435 - tests
LPS-46835 - Grant permission to .sh files in tcat bundle
LPS-46785 - Modify JBoss EAP build scripts
LPS-46532 - actions, functions, paths
LPS-46532 - macros
LPS-46532 - tests
LPS-46532 SF
LPS-46767 - Allowing &apos; inside parameters