ROX-31357: Backport IBM VM creationg fixes

[ovalenti]

Description

Backport #2372 to fix Z VM creation

[codecov-commenter]

Codecov Report

:white_check_mark: All modified and coverable lines are covered by tests. :white_check_mark: Project coverage is 27.60%. Comparing base (808f709) to head (a3271df). :white_check_mark: All tests successful. No failed tests found.

Additional details and impacted files

@@              Coverage Diff              @@
##           release-3.22    #2623   +/-   ##
=============================================
  Coverage         27.60%   27.60%           
=============================================
  Files                95       95           
  Lines              5422     5422           
  Branches           2523     2523           
=============================================
  Hits               1497     1497           
  Misses             3213     3213           
  Partials            712      712           

Flag	Coverage Δ
collector-unit-tests	27.60% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.