# Conflicts:
#	app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less

- Changes after CR.

[South] Bugs:
- MAGETWO-56072 [Performance] Image resize mechanism does not generate images of all necessary sizes
- MAGETWO-59904 [PR][Github] Update AccountLock.php #6952
- MAGETWO-53550 [Github][PR] Fix newsletter queue subscribers adding performance #4088
- MAGETWO-60047 [Porting] Error on adding address during checkout if add custom customer address attribute of file type - 2.2
- MAGETWO-56396 "Go Today" button in filter type date doesn`t apply value
- MAGETWO-59365 Countries list is not loaded if change customer website after country was selected
- MAGETWO-59924 File attribute doesn't have placeholder in admin

Merge branches 'develop' and 'pr-develop' of https://github.com/magento-frontend/magento2ce into pr-develop

# Conflicts:
#	app/code/Magento/Catalog/etc/di.xml

MAGETWO-59215: Optimize composer.json autoload

Bugs fixed:
* MAGETWO-60483: Catalog broken when all child products of configurable are disabled

[Firedrakes] Bugfixes:
- MAGETWO-55861 [IE11] User can't change/add new Address From Order page
- MAGETWO-58617 [GitHub] WYSIWYG editor loses data after show-hide editor #5811

- Changes after CR.

- Changes after CR.

- test logic automation.

MAGETWO-60201: Test UnsecureFunctionsUsageTest fails in case of changes in files with unsecure code
MAGETWO-60818: [FT] Incorrect array index 'frontend_type' in the CreateBundleProductEntityTest

Issues Fixed:

- MAGETWO-58446 Remove uses of unserialize in usages of \Magento\Framework\Cache\FrontendInterface::load()
- MAGETWO-58450 Remove uses of unserialize in usages of \Magento\Framework\App\CacheInterface::load()
- MAGETWO-58680 Remove uses of unserialize in usages of \Magento\Framework\Cache\FrontendInterface::load() 2
- MAGETWO-60442 Add optional SerializerInterface dependency to child classes of \Magento\Framework\Config\Data
- MAGETWO-60353 Replace json_decode in \Magento\Framework\ObjectManager\DefinitionFactory::_unpack with SerializerInterface

# Conflicts:
#	dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php
#	lib/internal/Magento/Framework/App/Config/ScopePool.php
#	lib/internal/Magento/Framework/App/ResourceConnection/Config.php
#	lib/internal/Magento/Framework/App/Test/Unit/Config/ScopePoolTest.php
#	lib/internal/Magento/Framework/App/Test/Unit/ResourceConnection/ConfigTest.php

# Conflicts:
#	dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php
#	lib/internal/Magento/Framework/App/Config/ScopePool.php
#	lib/internal/Magento/Framework/App/ResourceConnection/Config.php
#	lib/internal/Magento/Framework/App/Test/Unit/Config/ScopePoolTest.php
#	lib/internal/Magento/Framework/App/Test/Unit/ResourceConnection/ConfigTest.php

- fixed static build

[Frontend] Magetwo 56989: Deployment process can't be executed on separate machine	

- changes after CR

MAGETWO-58446: Remove uses of unserialize in usages of \Magento\Framework\Cache\FrontendInterface::load()

MAGETWO-61531: Paypal SSL Curl communication error, TLS 1.2