MAGETWO-34528: Contribution of Sprint 24 Work to Mainline

 - fixes for incorrect merging

Author: mazhalai

app/code/Magento/Store/etc/di.xml

@@ -230,12 +230,6 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\Module\DataSetup">
-        <arguments>
-            <argument name="resourceName" xsi:type="string">core_setup</argument>
-            <argument name="connectionName" xsi:type="string">Magento\Framework\Module\Updater::DEFAULT_SETUP_CONNECTION</argument>
-        </arguments>
-    </type>
     <type name="Magento\Framework\App\Helper\Context">
         <arguments>
             <argument name="urlBuilder" xsi:type="object">Magento\Framework\UrlInterface\Proxy</argument>