Merge "jjb: xci: xci-set-scenario: Drop errexit option"