[pungi-fedora] PR #1251: Reland kiwi build changes again with some extra fixes