fixup! Re-write upstart job template to be backwards compatible
Merge branch 'upstart-update' into wip