Backport ostree changes v2022dev1 -> v2021pre

Merge requests from v2022dev1: !19 (merged) and !20 (merged)

Upgrade v2020 -> v2021pre has been tested in LAVA.