Merge remote-tracking branch 'thunder/MAGETWO-86656' into PR-bugfixes

Author: Bohdan Korablov

app/code/Magento/Config/Model/Config/Importer.php

@@ -129,8 +129,10 @@ public function import(array $data)
 
                 // Invoke saving of new values.
                 $this->saveProcessor->process($changedData);
-                $this->flagManager->saveFlag(static::FLAG_CODE, $data);
             });
+
+            $this->scope->setCurrentScope($currentScope);
+            $this->flagManager->saveFlag(static::FLAG_CODE, $data);
         } catch (\Exception $e) {
             throw new InvalidTransitionException(__('%1', $e->getMessage()), $e);
         } finally {

app/code/Magento/Config/Test/Unit/Model/Config/ImporterTest.php

@@ -156,6 +156,9 @@ public function testImport()
         $this->scopeMock->expects($this->at(2))
             ->method('setCurrentScope')
             ->with('oldScope');
+        $this->scopeMock->expects($this->at(3))
+            ->method('setCurrentScope')
+            ->with('oldScope');
         $this->flagManagerMock->expects($this->once())
             ->method('saveFlag')
             ->with(Importer::FLAG_CODE, $data);