Merge forwardport of #11205 to 2.3-develop branch

Applied pull request patch https://github.com/magento/magento2/pull/11205.patch (created by @Tomasz-Silpion) based on commit(s):
  1. d98858e

Fixed GitHub Issues in 2.3-develop branch:
  - #11163: Magento 2.2.0 Pages showing error: Data key is missing: code-entity (reported by @kfaer)

app/code/Magento/GoogleOptimizer/view/adminhtml/ui_component/cms_page_form.xml

@@ -13,7 +13,12 @@
         </settings>
         <container name="google_experiment_container" sortOrder="250">
             <htmlContent name="html_content">
-                <block name="googleOptimizerBlockAdminhtmlFormCmsPage" class="Magento\GoogleOptimizer\Block\Adminhtml\Form\CmsPage" />
+                <block name="googleOptimizerBlockAdminhtmlFormCmsPage" class="Magento\GoogleOptimizer\Block\Adminhtml\Form\CmsPage">
+                    <arguments>
+                        <argument name="code-entity" xsi:type="string">Magento\GoogleOptimizer\Block\Adminhtml\Cms\Page\EntityCmsPage</argument>
+                        <argument name="form-name" xsi:type="string">cms_page_form</argument>
+                    </arguments>
+                </block>
             </htmlContent>
         </container>
     </fieldset>