Merge branch 'feature/build_8.1' into feature/test-fixes-december-23

Web/Controls/Help/Server/DeveloperEdition/ConfiguringDeveloper.ascx

@@ -890,7 +890,7 @@
                         <td><div class="copy-link" id="wopi-dummy-enable"><code>wopi.dummy.enable</code></div></td>
                         <td>Defines if the dummy handlers are enabled  or not.</td>
                         <td>boolean</td>
-                        <td><code>true</code></td>
+                        <td><code>false</code></td>
                     </tr>
                     <tr>
                         <td><div class="copy-link" id="wopi-dummy-sampleFilePath"><code>wopi.dummy.sampleFilePath</code></div></td>
@@ -931,7 +931,7 @@
     "privateKeyOld": "-----BEGIN PRIVATE KEY-----\nMIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDly93AJQ2GWnXC\nXZPK4yCYPcbiKp688MjVoB8UQ9OOZ7avdq8mm+BygHT85lERk+ICMdv6hLEvvuFj\niDF4c896QOe8i9mm9bVyZReVmV/8HdIGQtxsqYDPduHdL3qyKwomASaP0vTKMKyc\n4/eIPgfrXRBGTJindEMGOQBT0cqnJmwcd/pyW+Ixphx06ReQ52YWksB1bfbLk20t\nxCdfxpPnd3vcNS/KDte9xQVyd6JyJLw+DbYy5EO3XTwD8SpSmwaAmHbBM1wYxp9j\n6QK9c+BzQ3PO05lSo3V3ElzGY58dKqsfo62BVLnpRYpHfa+yguAqZxLENxlpmfJD\naEOJmE5pAgMBAAECggEALiL+RKOr0Xu8BOgQ0j1DwA03LxVrhXe6etmJI+JySTcd\ngKENjWziZVrRIi2DvUm5qMMl7WhSwslKK1eexxZJY7xASqSxcEoIwgz17T07/jxm\nfIdUBiUKDZ1Kv8PWmIr3oKW+fkXWi/m1zlIe0qXRpTmsGNEsHQLEqi0rmaiXTXOR\n/2Ldwi6kZR3sWFx97YS4Mx/pueGJTXEai6AVEZzN5Gog6xD8HXR1Rvq+hhd+MocG\nfnU4HgilKRfoJlWd9FOscgSufKG0L3ViO4fSKU46l5aullDYUk5ECMWiwuKSqSE7\nqD45jI3mbOre7S4u3S3TWdD3lzwiXL49LdwKlEC4mQKBgQD0sLr0GH4Wr+QX2xJE\nuA/Cb8QW41l8iSCBTRZZR/sJOd+o3rbcVidlzO/EbZblXG4ZPDmRjgBCGKIP5EZi\n0DsL+Wv32WOo44LpxJGhqExbm0H1iZ1zZ97l0P8fvIhHE42gmaLToOIGDhPSXGvv\nzlqOHbGbq4jsERc1jp1bej5q6wKBgQDwaueIc4pRchH98QYidcyr8Vwg9KhbnfYX\ny3W4RPlZtBdF34iJaio+ASzugo/zy1RTcVrsCskYWXyKDUQz1yu0iCng+fDCUnTm\nXGmEoEGNhk4vTJOt7hBav1/Ja/dUipGf6mXUuanwJ0e+1/Et/B0ah5X1Um5AyNZI\nM+SyRz3u+wKBgQCjvtUNXoqaghCBCmB6TjZ1prexnWkYFugCv2SSUMIk1W7gIlJ6\ntsjcrj1R1Qii6qzfBFd+GWoA0V06h0e2/qRVCg//p6GytrW33IycgvS+ZPLJ7tLI\nFR2r66WfRlpoPiSL8eRt/P7kkG0hXCn7K7ub2TEu/Ka/W1yNwad6PR8iCwKBgQC8\nXcZSrtQsxAc8w99emJVoEo9wcsCGJ9ltA0iUu9XyZpvlbyJ3J+s48YrWxQ0sop7L\nUgE+96Rfo51kPMi3JVtk81p8ntf4KMrWwokaFMXHsPcJMCJ1IBVIRLE0C5eZcYhv\nlyN57I4tT1lzOZYJxYK4Cot/zrn7oF/j6mTBGfh4iQKBgQCiJMUxRz01/czH/XSX\ngo3dVbHQ4FEOufWnE3Eb93S8r0/eq1RM118rb0TqzuiadW2xYDU4nucWQlrlmq0d\nFY/m+Hy97pqyk6jmoU5I/D+ssBIoYHWLnH9/xfvDEk2JGSJSHtzu0D4EDC/rgQ49\nMbYsO5oUrF8tPlhj5vzbf3GKLA==\n-----END PRIVATE KEY-----\n",
     "refreshLockInterval": "10m",
     "dummy": {
-        "enable": true,
+        "enable": false,
         "sampleFilePath": ""
     }
 }
@@ -1324,7 +1324,7 @@
                         <td><div class="copy-link" id="services-CoAuthoring-server-editorDataStorage"><code>services.CoAuthoring.server.editorDataStorage</code></div></td>
                         <td>Defines the editor data storage. The possible values: <em>"editorDataMemory"</em>, <em>"editorDataRedis"</em>, <em>""</em>.</td>
                         <td>string</td>
-                        <td><code>"editorDataMemory"</code></td>
+                        <td><code>"editorDataRedis"</code></td>
                     </tr>
                     <tr>
                         <td><div class="copy-link" id="services-CoAuthoring-server-editorStatStorage"><code>services.CoAuthoring.server.editorStatStorage</code></div></td>
@@ -1384,7 +1384,7 @@
             "maxRequestChanges": 20000,
             "openProtectedFile": true,
             "isAnonymousSupport": true,
-            "editorDataStorage": "editorDataMemory",
+            "editorDataStorage": "editorDataRedis",
             "editorStatStorage": "",
             "assemblyFormatAsOrigin": true,
             "newFileTemplate" : "../../document-templates/new",