Merge "Revert "Remove the -only CLI option for packer build""