Feature: Allow combining stack-env-settings and app-env-settings
Merge pull request #538 from fh/t/merge-envconfig

Feature: Allow combining stack-env-settings and app-env-settings