Merge remote-tracking branch 'mainline/master' into MAGETWO-40848-components-from-vendor

Author: Olga Kopylova

README.md

@@ -73,8 +73,8 @@ php -f index.php install --base-url=http://localhost/magento2/ \
 
 For example,
 ```
-/var/www/magento2/bin magento setup:upgrade
-/var/www/magento2/bin magento sampledata:install admin
+/var/www/magento2/bin/magento setup:upgrade
+/var/www/magento2/bin/magento sampledata:install admin
 ```
 
 #Removing Sample Data

app/code/Magento/SampleData/Module/Sales/Setup/Order/Processor.php

@@ -270,10 +270,6 @@ protected function refundOrder(\Magento\Sales\Model\Order\Item $orderItem)
         if ($creditmemo && $creditmemo->isValidGrandTotal()) {
             $creditmemo->setOfflineRequested(true);
             $this->creditmemoManagement->refund($creditmemo, true);
-            $creditmemoTransaction = $this->transactionFactory->create()
-                ->addObject($creditmemo)
-                ->addObject($creditmemo->getOrder());
-            $creditmemoTransaction->save();
         }
     }
 

app/code/Magento/SampleData/README.md

@@ -73,8 +73,8 @@ php -f index.php install --base-url=http://localhost/magento2/ \
 
 For example,
 ```
-/var/www/magento2/bin magento setup:upgrade
-/var/www/magento2/bin magento sampledata:install admin
+/var/www/magento2/bin/magento setup:upgrade
+/var/www/magento2/bin/magento sampledata:install admin
 ```
 
 #Removing Sample Data