More global App ENV cleanup.
Merge pull request #1917 from rwjblue/more-global-env-cleanup

More global App ENV cleanup.