Merge branch 'master' into 'erp5_texteditor_migration'

# Conflicts:
#   bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml

@@ -234,7 +234,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>977.7896.61696.31214</string> </value>
+                <value> <string>977.11616.36565.47718</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -252,7 +252,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1563307776.79</float>
+                        <float>1563530945.78</float>
                         <string>UTC</string>
                       </tuple>
                     </state>
@@ -321,4 +321,4 @@
       </tuple>
     </pickle>
   </record>
-</ZopeData>
+</ZopeData>
\ No newline at end of file