Merge remote-tracking branch 'origin/MAGETWO-97225' into 2.2-develop-pr16

Author: serhii-balko

app/code/Magento/Store/etc/frontend/di.xml

@@ -9,7 +9,7 @@
     <type name="Magento\Framework\App\FrontController">
         <plugin name="requestPreprocessor" type="Magento\Store\App\FrontController\Plugin\RequestPreprocessor" sortOrder="50"/>
     </type>
-    <type name="Magento\Framework\App\Action\Action">
+    <type name="Magento\Framework\App\Action\AbstractAction">
         <plugin name="contextPlugin" type="Magento\Store\App\Action\Plugin\Context" sortOrder="10"/>
     </type>
     <type name="Magento\Framework\App\RouterList" shared="true">