Merge pull request #18 from daniellemayne/develop

bugzid 3342: launch server with firewall (develop)
Merge pull request #20 from daniellemayne/develop

bugzid 3477: allow servers to be launched from public ubuntu images - develop