Merge remote-tracking branch 'origin/MAGETWO-69840' into 2.1.8-develop-pr21

Author: zakdma

app/code/Magento/Config/App/Config/Type/System.php

@@ -315,5 +315,6 @@ public function clean()
     {
         $this->data = [];
         $this->cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_TAG, [self::CACHE_TAG]);
+        $this->availableDataScopes = null;
     }
 }

dev/tests/integration/testsuite/Magento/Sales/Model/Order/Address/RendererTest.php

@@ -9,7 +9,7 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Sales\Model\Order\Address\Renderer as OrderAddressRenderer;
 use Magento\Config\Model\ResourceModel\Config as ConfigResourceModel;
-use Magento\Framework\App\Config;
+use Magento\Framework\App\Config\ScopeConfigInterface as Config;
 use Magento\Store\Model\Store;
 use Magento\Sales\Model\Order\Address as OrderAddress;
 use Magento\Sales\Model\Order;