Revert kiwi changes until we fix a few things
    
    This just reverts all the things kiwi was doing back to imagefactory.
    We want to do this so we can get some rawhide composes out, and
    cleanup/fix some last few issues before reverting this and re-landing
    the kiwi changes. It's very close.
    
    Signed-off-by: Kevin Fenzi <kevin@scrye.com>