MAGETWO-62387: Travis Build Fail - 2.2.0

Author: xmav

dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php

@@ -40,6 +40,7 @@ public function registerAnnotations(\Magento\TestFramework\Application $applicat
      *
      * Note: order of registering (and applying) annotations is important.
      * To allow config fixtures to deal with fixture stores, data fixtures should be processed first.
+     * ConfigFixture applied twice because data fixtures could clean config and clean custom settings
      *
      * @param \Magento\TestFramework\Application $application
      * @return array
@@ -68,6 +69,7 @@ protected function _getSubscribers(\Magento\TestFramework\Application $applicati
             new \Magento\TestFramework\Annotation\AppArea($application),
             new \Magento\TestFramework\Annotation\Cache($application),
             new \Magento\TestFramework\Annotation\AdminConfigFixture(),
+            new \Magento\TestFramework\Annotation\ConfigFixture(),
         ];
     }
 }

dev/tests/integration/framework/Magento/TestFramework/ObjectManager.php

@@ -24,8 +24,6 @@ class ObjectManager extends \Magento\Framework\App\ObjectManager
      * @var array
      */
     protected $persistedInstances = [
-        \Magento\TestFramework\App\Config::class,
-        \Magento\Framework\App\Config\ScopeConfigInterface::class,
         \Magento\Framework\App\ResourceConnection::class,
         \Magento\Framework\Config\Scope::class,
         \Magento\Framework\ObjectManager\RelationsInterface::class,

dev/tests/integration/testsuite/Magento/Catalog/Helper/DataTest.php

@@ -248,6 +248,7 @@ public function testGetPageTemplateProcessor()
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Customer/_files/customer_address.php
      * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
      * @dataProvider getTaxPriceDataProvider
      */
     public function testGetTaxPrice(