[c9s] Fixes for the new s390x "boot order" feature
JIRA: https://issues.redhat.com/browse/RHEL-68440
Fix certain boot scenarios that were not working yet with the new "boot order" feature.
Signed-off-by: Thomas Huth thuth@redhat.com
Resolves: RHEL-68440