Fix processing of unset build-args during build Upstream-commit: 50d32cdc08 Component: cli
50d32cdc08