Merge remote-tracking branch 'origin/zope4py2' into zope4py3

bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/favicon.ico.xml

@@ -8,7 +8,7 @@
       <dictionary>
         <item>
             <key> <string>_Cacheable__manager_id</string> </key>
-            <value> <string>http_cache</string> </value>
+            <value> <string>must_revalidate_http_cache</string> </value>
         </item>
         <item>
             <key> <string>__name__</string> </key>