Merge pull request #5774 from Tecnativa/18.0-imp-base-external_merges

[18.0][IMP] base: Load additional renames/merges from env.

Author: pedrobaeza

openupgrade_scripts/scripts/base/18.0.1.3/pre-migration.py

@@ -71,8 +71,12 @@ def migrate(cr, version):
             } AS (SELECT name, state FROM ir_module_module);
         """,
     )
-    openupgrade.update_module_names(cr, renamed_modules.items())
-    openupgrade.update_module_names(cr, merged_modules.items(), merge_modules=True)
+    openupgrade.update_module_names(
+        cr, renamed_modules.items(), environment_namespec=True
+    )
+    openupgrade.update_module_names(
+        cr, merged_modules.items(), merge_modules=True, environment_namespec=True
+    )
     openupgrade.clean_transient_models(cr)
     openupgrade.rename_xmlids(cr, _renamed_xmlids)
     openupgrade.copy_columns(