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