Bug 964835 - Allow a machine name to be passed on the command line