Merge branch '2019-11-20-env-migration'

- Migrate a number of common environment related options to Kconfig