changed to correct emulab machines
fixed merge conflict