LPS-36485 Move dependent controls under their parents
LPS-35835 Prevent duplicated controls in the import dialog
LPS-35835 Filter data and setup portlets by their portletDataHandlerClass
LPS-35835 Sort portlet lists in import dialog
LPS-35835 SF
LPS-36524 Include Site Role Permissions in export process for resources with layout scope
LPS-36524 SF
LPS-36493 Ensure PortalInstances.getCompanyIdsBySQL inserts proper shard name in SQL query

The if clause must be around the ps.setString() because we must not change the value of currentShardName at that point see https://github.com/JorgeFerrer/liferay-portal/pull/188#issuecomment-19759267 for details
LPS-35845 Uncheck the main control if all the controls in its dialog are unchecked
LPS-36433 User unable to edit his own article through Asset Publisher if he has only owner permission for the article

Simple fix, meant to be easy to backport.
LPS-36582 Change the default view to descriptive for Journal
LPS-35072 DLFileEntryType is not being applied to the matching file entry after publishing
LPS-35072 Asset publisher preference classTypeIds can both contain DDMStructure and DLFileEntryType ids
LPS-35072 Updating test class for fixed scenario
LPS-35072 SF
LPS-35072 sort (no changes)
LPS-35072 More tests for other situations in asset publisher
LPS-35072 SF
LPS-35681 Wiki : ResourceTypes in ckeditor's fileBrowser contains only Attachment
LPS-35681 Cleaner replacement