rpm-ostree: Add workaround for new ostree container format
Based on top of !428 (merged).
This implements a workaround for the following bug in rpm-ostree: https://github.com/coreos/rpm-ostree/issues/4176
We should revert those commits once the bug is fixed.