LPS-50680 WSRP ProxyServlet should preserve the headers and status code from URLConnection when it serves static resources
LPS-50680 SF
LPS-50680 SF
SF - Use compat imports

LPS-42924 SF

LRDCOM-12051 SF

SF - General SF due to SourceFormatter changes

SF - Hooks - Use compat imports

LPS-42880 SF

SF - Shared - Use compat imports

CLDSVCS-649 SF

SF - Themes - General SF due to SourceFormatter changes

SF - Webs - Use compat imports

CLDSVCS-477 SF

CLDSVCS-788 SF

SF

Conflicts:
	hooks/osb-hook/docroot/WEB-INF/src/com/liferay/osb/hook/messaging/SynchronizeSvnAccessMessageListener.java
	hooks/so-hook/docroot/WEB-INF/src/com/liferay/so/hook/upgrade/v2_0_4/UpgradeLayout.java
	hooks/so-hook/docroot/WEB-INF/src/com/liferay/so/hook/upgrade/v2_0_4/UpgradeLayoutSet.java
	hooks/so-hook/docroot/WEB-INF/src/com/liferay/so/hook/upgrade/v2_0_4/UpgradeTheme.java
	portlets/ecommerce-portlet/docroot/WEB-INF/src/com/liferay/ecommerce/service/impl/ECCountryLocalServiceImpl.java
	portlets/hr-portlet/docroot/WEB-INF/jsp/util/init.jsp
	portlets/hubspot-portlet/docroot/WEB-INF/src/com/liferay/hubspot/finder/LicenseKeyFinder.java
	portlets/hubspot-portlet/docroot/WEB-INF/src/com/liferay/hubspot/finder/UserFinder.java
	portlets/hubspot-portlet/docroot/WEB-INF/src/com/liferay/hubspot/service/impl/HSContactLocalServiceImpl.java
	portlets/kaleo-designer-portlet/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/designer/service/impl/KaleoDraftDefinitionLocalServiceImpl.java
	portlets/kaleo-forms-portlet/docroot/init.jsp
	portlets/osb-ui-portlet/docroot/WEB-INF/src/com/liferay/osbui/assetentrieslist/util/AssetEntriesListUtil.java
	portlets/osb-ui-portlet/docroot/asset_entries_list/init.jsp
	portlets/reports-portlet/docroot/WEB-INF/src/com/liferay/reports/service/impl/DefinitionServiceImpl.java
	portlets/reports-portlet/docroot/WEB-INF/src/com/liferay/reports/service/impl/EntryLocalServiceImpl.java
	portlets/reports-portlet/docroot/WEB-INF/src/com/liferay/reports/service/impl/EntryServiceImpl.java
	portlets/reports-portlet/docroot/WEB-INF/src/com/liferay/reports/service/impl/SourceServiceImpl.java
	portlets/reports-portlet/docroot/init.jsp
	portlets/salesforce-etl-portlet/ivy.xml
	portlets/salesforce-portlet/docroot/WEB-INF/service/com/liferay/salesforce/query/SearchReturnSpecification.java
	portlets/salesforce-portlet/docroot/WEB-INF/service/com/liferay/salesforce/query/builder/SearchQuery.java
	portlets/saml-portlet/docroot/WEB-INF/src/com/liferay/saml/resolver/DefaultUserResolver.java
	portlets/saml-portlet/docroot/WEB-INF/src/com/liferay/saml/util/OpenSamlUtil.java
	portlets/testray-portlet/docroot/WEB-INF/jsp/util/init.jsp
	shared/osb-lcs-queue-shared/ivy.xml
	shared/osb-shared/src/com/liferay/osb/metrics/processor/OSBMetricsProcessorRegistryUtil.java
	shared/osb-shared/src/com/liferay/osb/metrics/synchronizer/OSBMetricsSynchronizerRegistryUtil.java
	shared/osb-shared/src/com/liferay/osb/shared/util/OSBUtil.java
	themes/osb-universal-theme/docroot/_diffs/templates/navigation.vm
	themes/osb-www-theme/docroot/_diffs/css/base.accessories.css
	themes/osb-www-theme/docroot/_diffs/css/base.elements.css
	themes/osb-www-theme/docroot/_diffs/css/font.carto-gothic-std.css
	themes/osb-www-theme/docroot/_diffs/css/liferay.application.custom.css
	themes/osb-www-theme/docroot/_diffs/css/liferay.dockbar.custom.css
	themes/osb-www-theme/docroot/_diffs/css/liferay.portlet.custom.css
	themes/osb-www-theme/docroot/_diffs/css/style.buttons.css
	themes/osb-www-theme/docroot/_diffs/css/style.callouts.css
	themes/osb-www-theme/docroot/_diffs/css/style.forms.css
	themes/osb-www-theme/docroot/_diffs/css/style.grids.css
	themes/osb-www-theme/docroot/_diffs/css/style.headings.css
	themes/osb-www-theme/docroot/_diffs/css/style.navigations.css
	themes/osb-www-theme/docroot/_diffs/css/style.page-headings.css
	themes/osb-www-theme/docroot/_diffs/css/style.portlet.blogs.css
	themes/osb-www-theme/docroot/_diffs/css/style.portlet.message-boards.css
	themes/osb-www-theme/docroot/_diffs/css/style.reports.css
	themes/osb-www-theme/docroot/_diffs/css/style.taglibs.css
	themes/so-strata-theme/overwrite/css/so-skin-ee.css
	themes/so-theme/overwrite/css/so-skin-ee.css
	themes/so-welcome-theme/overwrite/css/so-skin-ee.css
	webs/file-repository-web/docroot/WEB-INF/src/com/liferay/filerepository/util/ClusteredEncryptFileNamesThread.java
	webs/jasperreports-web/docroot/WEB-INF/src/com/liferay/portal/bi/reporting/jasperreports/fillmanager/BaseReportFillManager.java
	webs/osb-lcs-gateway-web/docroot/WEB-INF/src/com/liferay/osb/lcs/gateway/web/LCSGatewayController.java
	webs/ssh-admin-web/docroot/WEB-INF/web.xml
	webs/svn-admin-web/docroot/WEB-INF/web.xml
	webs/vldap-web/docroot/WEB-INF/src/com/liferay/vldap/server/directory/builder/UserBuilder.java
CLDSVCS-965 json-webservice-client-shared - JSON parsing via Jackson fails when the content is an empty string
CLDSVCS-965 SF
CLDSVCS-973 json-webservice-client-shared - java.nio.charset.StandardCharsets class doesn't exists in Java 6, only in Java 7+
CLDSVCS-973 json-webservice-client-shared - SF
LPS-49971 add locking for task transitions 61x
LPS-49971 SF - Keep wording from Master (1e553bb953d9c940b81420d96c447a6dabf4b1a5)
LPS-50409
LPS-50409 SF
LPS-50932 json-web-service-client-shared - replace apache Charsets class with String representation (effect is same and code works with later commons-codec lib versions)