LPS-32662 Moving getFieldsDisplayValues method to DDMUtil
LPS-32662 Fields Display reference in the JournalCoverter should be updated after DDM Structure is modified
LPS-32662 Source formatting
LPS-32523
Resources referenced from a blog post contained in a scoped layout are lost on import
LPS-32523 apply the same log for DDM and Journal
LPS-32523 source formatting
LPS-30964; LPS-30967 Update permisions to match new entities names

Conflicts:

	portal-impl/src/com/liferay/portal/upgrade/v6_2_0/UpgradeJournal.java
LPS-30964; LPS-30967 Source formatting
LPS-30964; LPS-30967 Source formatting
LPS-32488 - Add portal.properties setting to open Dockbar Manage links as maximized portlets or iframes
LPS-32488 Add portal property and fix several issues
LPS-32488 - Source formatting
LPS-32488 Source formatting
LPS-13488 Static methods addLayout of LayoutLocalServiceUtil do not save attribute title for layout
LPS-13488 javadoc
LPS-13488 Regenerate
LPS-13488 Source formatting
LPS-13488 Remove JavaDoc since it's not a proper sentence (Jim, can you readd?) Thx.
LPS-13488 Use the same variable names as the method that it delegates to
LPS-26046 LPS-32257 Upgrade to Tika 1.3 + dependencies