[MERGE] forward port branch 10.0 up to 271f1ec6

odoo/addons/test_new_api/__manifest__.py

@@ -10,7 +10,9 @@
     'data': [
         'ir.model.access.csv',
         'views.xml',
-        'demo_data.xml',
         'template.xml',
     ],
+    'demo': [
+        'demo_data.xml',
+    ],
 }