Merge branch 'hotfix/unicorn_production_2'

* hotfix/unicorn_production_2:
  unicorn config workdir changed
stub removed
Merge branch 'hotfix/stub_remove' into develop

* hotfix/stub_remove:
  stub removed