Fix processing of unset build-args during build Upstream-commit: 4b7ad6c23e Component: cli
4b7ad6c23e