The ApplicationsPanelConfiguration and NavigationConfiguration pages should be of customizable type

Looks like xwiki-platform-distribution-flavor-common does not declare Panels.ApplicationsPanelConfiguration as a configuration page, thus, when this configuration is modified and when the wiki is upgraded through the distribution wizard, a merge conflict is displayed.