Handle job names with spaces in them correctly
Merge branch 'COOK-3497'
update Ubuntu 10.04 box naming to match other boxes