MAGETWO-34125: Merge MAGETWO-32073 and design changes to mainline

- fix tests

Author: Alex Bomko

setup/src/Magento/Setup/Test/Unit/Controller/CustomizeYourStoreTest.php

@@ -69,9 +69,9 @@ public function indexActionDataProvider()
         $currency = ['currency' => ['USD'=>'US Dollar', 'EUR' => 'Euro']];
         $language = ['language' => ['en_US'=>'English (USA)', 'en_UK' => 'English (UK)']];
         $sampleData = [
+            'isSampledataEnabled' => null,
             'isSampleDataInstalled' => null,
-            'isSampleDataErrorInstallation' => null,
-            'isSampledataEnabled' => null
+            'isSampleDataErrorInstallation' => null
         ];
         $sampleDataTrue = array_merge($sampleData, ['isSampledataEnabled' => true]);
         $sampleDataFalse = array_merge($sampleData, ['isSampledataEnabled' => false]);