Thanks Adam.

I now think that keeping things as close to master as possible is
necessary until we stabilize set of features we need. Until then,
let's keep openQA/os-autoinst up to date with upstream, even if
it means that we'll miss compose check report or two :-).