fix supervisorctl update problem with working directory
Merge branch 'master' into service-polling