Merge branch 'hotfix/unicorn_production'

* hotfix/unicorn_production:
  production unicorn workdir changed
unicorn config workdir changed
Merge branch 'hotfix/unicorn_production_2' into develop

* hotfix/unicorn_production_2:
  unicorn config workdir changed