[IZPACK-989] ConfigurationInstallerListener - XML merge fixes and improvements (task with subissues)
Merge remote-tracking branch 'origin/IZPACK-989' into IZPACK-989

Conflicts:
	izpack-util/pom.xml