MAGETWO-70797: Use backend model also for default config values #7742

 - Merge Pull Request #7742 from kweij/magento2:patch-2
 - Merged commits:
   1. f2f1d36
   2. 38f1343
   3. 3d01997
   4. 94b9511
   5. e8981b8

Author: Oleksii Korshenko

app/code/Magento/Config/Block/System/Config/Form.php

@@ -427,21 +427,21 @@ private function getFieldData(\Magento\Config\Model\Config\Structure\Element\Fie
         if ($data === null) {
             if (array_key_exists($path, $this->_configData)) {
                 $data = $this->_configData[$path];
-
-                if ($field->hasBackendModel()) {
-                    $backendModel = $field->getBackendModel();
-                    $backendModel->setPath($path)
-                        ->setValue($data)
-                        ->setWebsite($this->getWebsiteCode())
-                        ->setStore($this->getStoreCode())
-                        ->afterLoad();
-                    $data = $backendModel->getValue();
-                }
             } elseif ($field->getConfigPath() !== null) {
                 $data = $this->getConfigValue($field->getConfigPath());
             } else {
                 $data = $this->getConfigValue($path);
             }
+
+            if ($field->hasBackendModel()) {
+                $backendModel = $field->getBackendModel();
+                $backendModel->setPath($path)
+                    ->setValue($data)
+                    ->setWebsite($this->getWebsiteCode())
+                    ->setStore($this->getStoreCode())
+                    ->afterLoad();
+                $data = $backendModel->getValue();
+            }
         }
 
         return $data;

app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php

@@ -676,7 +676,7 @@ public function initFieldsDataProvider()
                 true,
                 'Config Value',
                 null,
-                0,
+                1,
                 true,
                 false,
                 true