Fix plugin.xml broken by merge