LPS-30261 Fix "test-sample-sql"
LPS-35207 Move storageType autopropagated parameter to DDMDisplay

Conflicts:
	portal-impl/src/com/liferay/portlet/documentlibrary/ddm/DLDDMDisplay.java
	portal-impl/src/com/liferay/portlet/journal/ddm/JournalDDMDisplay.java
	portal-service/src/com/liferay/portlet/dynamicdatamapping/util/BaseDDMDisplay.java
	portal-service/src/com/liferay/portlet/dynamicdatamapping/util/DDMDisplay.java
	portal-web/docroot/html/portlet/dynamic_data_mapping/init.jsp
LPS-35207 Source formatting
LPS-35207 Move structureType autopropagated parameter to DDMDisplay

Conflicts:
	portal-impl/src/com/liferay/portlet/documentlibrary/ddm/DLDDMDisplay.java
	portal-impl/src/com/liferay/portlet/journal/ddm/JournalDDMDisplay.java
	portal-service/src/com/liferay/portlet/dynamicdatamapping/util/BaseDDMDisplay.java
	portal-service/src/com/liferay/portlet/dynamicdatamapping/util/DDMDisplay.java
	portal-web/docroot/html/portlet/dynamic_data_mapping/init.jsp
LPS-35207 Source formatting
LPS-35207 Move structureName autopropagated parameter to DDMDisplay

Conflicts:
	portal-impl/src/com/liferay/portlet/documentlibrary/ddm/DLDDMDisplay.java
	portal-service/src/com/liferay/portlet/dynamicdatamapping/util/BaseDDMDisplay.java
	portal-web/docroot/html/portlet/dynamic_data_mapping/init.jsp
LPS-35207 Source formatting
LPS-35207 Move templateType autopropagated parameter to DDMDisplay

Conflicts:
	portal-service/src/com/liferay/portlet/dynamicdatamapping/util/BaseDDMDisplay.java
LPS-35207 Move avaliableFields autopropagated parameter to DDMDisplay

Conflicts:
	portal-impl/src/com/liferay/portlet/journal/ddm/JournalDDMDisplay.java
	portal-service/src/com/liferay/portlet/dynamicdatamapping/util/BaseDDMDisplay.java
	portal-service/src/com/liferay/portlet/dynamicdatamapping/util/DDMDisplay.java
	portal-web/docroot/html/portlet/dynamic_data_mapping/init.jsp
LPS-35207 Source formatting
LPS-35207 Move templateMode autopropagated parameter to DDMDisplay

Conflicts:
	portal-service/src/com/liferay/portlet/dynamicdatamapping/util/BaseDDMDisplay.java
	portal-web/docroot/html/portlet/dynamic_data_mapping/init.jsp
LPS-35207 Source formatting
LPS-35207 Match copy_structure.jsp
LPS-35207 SF
LPS-35207 Lang keys