MAGETWO-36882: Stabilizing branch

Author: akaplya

app/code/Magento/Sales/Model/Resource/Collection/AbstractCollection.php

@@ -38,7 +38,7 @@ public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Sales\Model\Resource\EntitySnapshot $entitySnapshot,
         $connection = null,
-        \Magento\Sales\Model\Resource\EntityAbstract $resource = null
+        \Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
     ) {
         $this->entitySnapshot = $entitySnapshot;
         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $connection, $resource);

app/code/Magento/Sales/Model/Resource/Order/Status.php

@@ -60,7 +60,6 @@ public function __construct(
             $sequenceManager,
             $entitySnapshot,
             $resourcePrefix,
-            $resourcePrefix,
             $gridAggregator);
     }