LPS-32641 Source formatting
LPS-27530 Refactoring path check in export to base class for staged model data handlers
LPS-27530 source formating - avoid double negative, it is very confusing
LPS-27530 Making NAMESPACE to be public, more refined refactoring is coming up for data handler constants
LPS-31950 Adapt framework
LPS-31950 format source
LPS-31950 Source formatting
LPS-32305 preventing password reminder for default user
LPS-32305 Source formatting
LPS-32626 - Fix copy and paste in BBCode data processor
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