Include both image variants in the ISO image
This gives us a single installer image that can install both the ostree and the sysupdate variant. We can drop the ostree variant later, when sysupdate is no longer considered experimental.
Related to #832
Edited by Abderrahim Kitouni