Merge branch 'MAGETWO-52994' into MPI-PR-3005

Author: oshmyheliuk

app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action/UrlBuilder.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Cms\Block\Adminhtml\Page\Grid\Renderer\Action;
 
+use Magento\Store\Api\StoreResolverInterface;
+
 class UrlBuilder
 {
     /**
@@ -33,8 +35,12 @@ public function getUrl($routePath, $scope, $store)
         $this->frontendUrlBuilder->setScope($scope);
         $href = $this->frontendUrlBuilder->getUrl(
             $routePath,
-            ['_current' => false, '_query' => '___store=' . $store]
+            [
+                '_current' => false,
+                '_query' => [StoreResolverInterface::PARAM_NAME => $store]
+            ]
         );
+
         return $href;
     }
 }