[Fedora-spins] [spin-kickstarts/f21] fixes from Ian McLeod to make composes work using new scheme.