LPS-27868 The portal context is already added in method getHomeUrl.
LPS-27868 getHomeURL() and COMPANY_DEFAULT_HOME_URL should not have the context path, however getLayoutFriendlyURL() does
LPS-32352 Fix category search in Asset Pusblisher configuration - Global category is never found in Select pop-up - Backend changes
LPS-32352 Fix category search in Asset Pusblisher configuration - Global category is never found in Select pop-up - UI changes
LPS-32352 Source formatting
LPS-32352 We don't need a custom finder for this logic
LPS-32352 Regenerate
LPS-32352 Use proper finder name
LPS-32602
LPS-32602 Regenerate
LPS-32586 Unable to see data of custom fields in custom file type.
LPS-32586 Applying same pattern to DDL
LPS-30964 Upgrade JournalStructures to DDMStructures

Conflicts:
	portal-impl/src/com/liferay/portal/upgrade/UpgradeProcess_6_2_0.java
	portal-impl/src/com/liferay/portal/upgrade/v6_2_0/UpgradeJournal.java
LPS-30967 Upgrade JournalTemplates to DDMTemplates

Conflicts:
	portal-impl/src/com/liferay/portal/upgrade/v6_2_0/UpgradeJournal.java
LPS-30967 mass refactoring, still contains a but when a journal structure ID can conflict with an existing ddm structure key
Test Fixes - plugins/testtransaction
LPS-32595
LPS-32595
LPS-32400
LPS-32400