[Bug 515576] kiwi: how to bring changes with kiwi --upgrade back to the config.xml