Remove app specific environment variables
Merge branch 'upstart-update' into wip