Merge remote-tracking branch 'origin/MAGETWO-59622' into 2.1.8-develop-pr18

Author: zakdma

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

@@ -13,6 +13,9 @@
 
 class UpgradeData implements UpgradeDataInterface
 {
+    /**
+     * @deprecated
+     */
     const PRIVACY_COOKIE_PAGE_ID = 4;
 
     /**
@@ -234,7 +237,10 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
     </table>
 </div>
 EOD;
-            $privacyAndCookiePolicyPage = $this->createPage()->load(self::PRIVACY_COOKIE_PAGE_ID);
+            $privacyAndCookiePolicyPage = $this->createPage()->load(
+                'privacy-policy-cookie-restriction-mode',
+                'identifier'
+            );
             $privacyAndCookiePolicyPageId = $privacyAndCookiePolicyPage->getId();
             if ($privacyAndCookiePolicyPageId) {
                 $privacyAndCookiePolicyPage->setContent($newPageContent);