Minor issues found whilst setting up OMERO-OMEGO-upgrade-example

Test:
Run http://hudson.openmicroscopy.org.uk/job/OMERO-OMEGO-upgrade-example/
Make sure the MERGE parameter is enabled.
Check the previous zip is deleted.
Pass an invalid job name, shoulkd get an error instead of an XML parse exception.