stop-on-error
fixup! stop-on-error
fixup! fixup! stop-on-error
fixup! fixup! fixup! stop-on-error
Merge remote-tracking branch 'origin/without_make'

Conflicts:
	software/zerovm_ftests.sh/software.cfg