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