Add workarounds for ostree overlay issue (#2266344)
    
    jlebon and jmarrero figured out the fix for this, while we wait
    for the packager to merge it their preferred way, let's use
    scratch builds to work around it so every update doesn't get a
    failed test.
    
    Signed-off-by: Adam Williamson <awilliam@redhat.com>