Revert "Merge branch 'expand_envs_config' of github.com:ecnahc515/heka into ecnahc515-expand_envs_config"

This reverts commit cbe13198f8082ead1005650512bfaef5695254d9, reversing
changes made to 663e613c9cf7a0f0e3752bade312abba86af3f7f.