Includes some mods suggested by Dan.  Allow to ignore errors on KVM build host.
Includes some mods suggested by Dan.  Allow to ignore errors on KVM build host.

wgerlach/deploy_tools,scanon/deploy_tools,wgerlach/deploy_tools,danielolson5/deploy_tools,danielolson5/deploy_tools,wgerlach/deploy_tools,kbase/deploy_tools,scanon/deploy_tools,danielolson5/deploy_tools,kbase/deploy_tools,scanon/deploy_tools,kbase/deploy_tools,danielolson5/deploy_tools,kbase/deploy_tools