Merge remote-tracking branch 'af/B2B-1637' into develop-prs

Author: rganin

app/code/Magento/Config/etc/di.xml

@@ -96,7 +96,7 @@
 
     <virtualType name="systemConfigQueryLocker" type="Magento\Framework\Cache\LockGuardedCacheLoader">
         <arguments>
-            <argument name="locker" xsi:type="object">Magento\Framework\Lock\Backend\Database</argument>
+            <argument name="locker" xsi:type="object">Magento\Framework\Lock\Proxy</argument>
         </arguments>
     </virtualType>