Merge branch 'MAGETWO-61188' of github.com:magento-east/magento2ce into pr-2.0

Author: Sergey Shvets

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

@@ -448,7 +448,7 @@
     <preference for="Magento\Catalog\Api\ProductWebsiteLinkRepositoryInterface" type="Magento\Catalog\Model\ProductWebsiteLinkRepository" />
     <preference for="\Magento\Catalog\Api\CategoryLinkRepositoryInterface" type="\Magento\Catalog\Model\CategoryLinkRepository" />
     <preference for="Magento\Catalog\Api\Data\ProductCustomOptionInterface" type="Magento\Catalog\Model\Product\Option" />
-    <preference for="Magento\Catalog\Api\ProductCustomOptionRepositoryInterface" type="\Magento\Catalog\Model\Product\Option\Repository" />
+    <preference for="Magento\Catalog\Api\ProductCustomOptionRepositoryInterface" type="Magento\Catalog\Model\Product\Option\Repository" />
     <preference for="Magento\Catalog\Api\Data\ProductCustomOptionTypeInterface" type="Magento\Catalog\Model\Product\Option\Type" />
     <preference for="Magento\Catalog\Api\ProductTierPriceManagementInterface" type="\Magento\Catalog\Model\Product\TierPriceManagement" />
     <preference for="Magento\Catalog\Api\Data\ProductTierPriceInterface" type="Magento\Catalog\Model\Product\TierPrice" />

setup/src/Magento/Setup/Module/Di/Code/Scanner/RepositoryScanner.php

@@ -3,6 +3,7 @@
  * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Setup\Module\Di\Code\Scanner;
 
 use Magento\Framework\Autoload\AutoloaderRegistry;
@@ -39,6 +40,8 @@ public function collectEntities(array $files)
                     && $replacementType !== null
                     && (substr($forType->nodeValue, -19) === 'RepositoryInterface')
                 ) {
+                    // backward compatibility workaround for composer below 1.3.0
+                    // (https://github.com/composer/composer/issues/5923)
                     $nodeValue = ltrim($replacementType->nodeValue, '\\');
                     if (!class_exists($nodeValue, false)
                         && !AutoloaderRegistry::getAutoloader()->loadClass($nodeValue)