XWIKI-19206: The entry type of a page in an extension is not honored upon...

XWIKI-19206: The entry type of a page in an extension is not honored upon install with EM if the extension depends on another extension which specifies a different entry type for the same page

xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/xwiki-platform-extension-handler-xar/src/main/java/org/xwiki/extension/xar/internal/handler/XarExtensionPlan.java

@@ -112,6 +112,8 @@ public XarExtensionPlan(ExtensionPlan plan, InstalledExtensionRepository xarRepo
                                 pages = new HashMap<>();
                                 this.previousXAREntries.put(wiki, pages);
                             }
+                            // We want to replace the key too because the type might be different but HashMap keep the old one
+                            pages.remove(entry);
                             pages.put(entry, xarPlanEntry);
                         }
                     }
@@ -138,6 +140,8 @@ public XarExtensionPlan(ExtensionPlan plan, InstalledExtensionRepository xarRepo
                                 pages = new HashMap<>();
                                 this.nextXAREntries.put(wiki, pages);
                             }
+                            // We want to replace the key too because the type might be different but HashMap keep the old one
+                            pages.remove(entry);
                             pages.put(entry, nextExtension);
                         }
                     } catch (Exception e) {