Merge remote-tracking branch 'goinc/MAGETWO-34192' into MAGETWO-34346

Author: orlangur

app/code/Magento/UrlRewrite/Controller/Router.php

@@ -85,6 +85,7 @@ public function match(\Magento\Framework\App\RequestInterface $request)
             return $this->processRedirect($request, $rewrite);
         }
 
+        $request->setAlias(\Magento\Framework\UrlInterface::REWRITE_REQUEST_PATH_ALIAS, $rewrite->getRequestPath());
         $request->setPathInfo('/' . $rewrite->getTargetPath());
         return $this->actionFactory->create('Magento\Framework\App\Action\Forward', ['request' => $request]);
     }

dev/tests/unit/testsuite/Magento/UrlRewrite/Controller/RouterTest.php

@@ -252,8 +252,11 @@ public function testMatch()
             ->disableOriginalConstructor()->getMock();
         $urlRewrite->expects($this->any())->method('getRedirectType')->will($this->returnValue(0));
         $urlRewrite->expects($this->any())->method('getTargetPath')->will($this->returnValue('target-path'));
+        $urlRewrite->expects($this->any())->method('getRequestPath')->will($this->returnValue('request-path'));
         $this->urlFinder->expects($this->any())->method('findOneByData')->will($this->returnValue($urlRewrite));
         $this->request->expects($this->once())->method('setPathInfo')->with('/target-path');
+        $this->request->expects($this->once())->method('setAlias')
+            ->with(\Magento\Framework\UrlInterface::REWRITE_REQUEST_PATH_ALIAS, 'request-path');
         $this->actionFactory->expects($this->once())->method('create')
             ->with('Magento\Framework\App\Action\Forward', ['request' => $this->request]);