[Fedora-spins] [spin-kickstarts] SoaS: merge fixes from branch