fixes from Ian McLeod to make composes work using new scheme.
    
    NOTE: this WILL NOT WORK without other changes to coms and spin/install (but
    the current ones are broken anyway so I'm committing this).
    
    See https://lists.fedoraproject.org/pipermail/cloud/2014-September/004207.html
    for details