Merge remote-tracking branch 'upstream/develop' into MAGETWO-31493-helper-components

Conflicts:
	app/code/Magento/Developer/composer.json
	dev/tests/unit/testsuite/Magento/Cookie/Helper/CookieTest.php
	dev/tests/unit/testsuite/Magento/Setup/Model/UserConfigurationDataMapperTest.php

Author: Joan He

dev/tests/unit/testsuite/Magento/Setup/Model/UserConfigurationDataMapperTest.php

@@ -7,7 +7,7 @@
 namespace Magento\Setup\Model;
 
 use Magento\Backend\Model\Url;
-use Magento\Core\Helper\Data;
+use Magento\Directory\Helper\Data;
 use Magento\Directory\Model\Currency;
 use Magento\Setup\Module\Setup;
 use Magento\Store\Model\Store;