Merge remote-tracking branch 'upstream/develop' into...

Merge remote-tracking branch 'upstream/develop' into MAGETWO-58680-remove-unserialize-cache-frontend-interface-rebased

app/code/Magento/CatalogInventory/Setup/UpgradeData.php

@@ -54,7 +54,7 @@ class UpgradeData implements UpgradeDataInterface
     public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
         $setup->startSetup();
-        if (version_compare($context->getVersion(), '2.0.2') < 0) {
+        if (version_compare($context->getVersion(), '2.2.0') < 0) {
             $this->upgradeCatalogInventoryStockItem($setup);
         }
         $setup->endSetup();

app/code/Magento/CatalogInventory/etc/module.xml

@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_CatalogInventory" setup_version="2.0.2">
+    <module name="Magento_CatalogInventory" setup_version="2.2.0">
         <sequence>
             <module name="Magento_Catalog"/>
         </sequence>