MAGETWO-43302: Prepare pull request for M11 nord changes

Author: Yaroslav Onischenko

app/code/Magento/CatalogUrlRewrite/etc/setup/events.xml

@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/Event/etc/events.xsd">
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
     <event name="catalog_product_save_after">
         <observer name="process_url_rewrite_saving" instance="\Magento\CatalogUrlRewrite\Observer\ProductProcessUrlRewriteSavingObserver" method="execute"/>
     </event>

app/code/Magento/SampleData/cli_commands.php

@@ -4,4 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-\Magento\Framework\Console\CommandLocator::register('Magento\SampleData\Console\CommandList');
+if (PHP_SAPI == 'cli') {
+    \Magento\Framework\Console\CommandLocator::register('Magento\SampleData\Console\CommandList');
+}

app/code/Magento/SampleData/composer.json

@@ -14,14 +14,6 @@
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "extra": {
-        "map": [
-            [
-                "*",
-                "Magento/SampleData"
-            ]
-        ]
-    },
     "autoload": {
         "files": [
             "cli_commands.php",

app/code/Magento/SampleData/etc/module.xml

@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
     <module name="Magento_SampleData" setup_version="2.0.0">
     </module>
 </config>

app/code/Magento/SampleData/registration.php

@@ -5,7 +5,7 @@
  */
 
 \Magento\Framework\Component\ComponentRegistrar::register(
-        \Magento\Framework\Component\ComponentRegistrar::MODULE,
-        'Magento_SampleData',
+    \Magento\Framework\Component\ComponentRegistrar::MODULE,
+    'Magento_SampleData',
     __DIR__
 );