Merge branch 'MAGETWO-40131' of https://github.corp.ebay.com/magento-firedrakes/magento2ce into last_bugs

Author: sivaschenko

app/code/Magento/Sales/Block/Adminhtml/Order/Grid.php

@@ -12,51 +12,4 @@
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid
 {
-    /**
-     * @var \Magento\Framework\View\Element\UiComponentFactory
-     */
-    protected $componentFactory;
-
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Backend\Helper\Data $backendHelper
-     * @param \Magento\Framework\View\Element\UiComponentFactory $componentFactory
-     * @param array $data
-     */
-    public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Backend\Helper\Data $backendHelper,
-        \Magento\Framework\View\Element\UiComponentFactory $componentFactory,
-        array $data = []
-    ) {
-        $this->componentFactory = $componentFactory;
-        parent::__construct($context, $backendHelper, $data);
-    }
-
-    /**
-     * @return $this
-     * @throws \Magento\Framework\Exception\LocalizedException
-     */
-    protected function _prepareCollection()
-    {
-        $component = $this->componentFactory->create('sales_order_grid');
-        $this->prepareComponent($component);
-        $component->render();
-        $collection = $component->getContext()->getDataProvider()->getCollection();
-        $this->setData('dataSource', $collection);
-
-        return parent::_prepareCollection();
-    }
-
-    /**
-     * @param \Magento\Framework\View\Element\UiComponentInterface $componentElement
-     * @return void
-     */
-    protected function prepareComponent(\Magento\Framework\View\Element\UiComponentInterface $componentElement)
-    {
-        foreach ($componentElement->getChildComponents() as $childComponent) {
-            $this->prepareComponent($childComponent);
-        }
-        $componentElement->prepare();
-    }
 }

app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php

@@ -21,7 +21,7 @@ abstract class AbstractMassAction extends \Magento\Backend\App\Action
     /**
      * Redirect url
      */
-    const REDIRECT_URL = '*/*/';
+    const REDIRECT_URL = 'sales/order/';
 
     /**
      * Resource collection