Need to do some tricks to get the env app id stuff to work#683

rsproule merged 2 commits intomasterMerit-Systems/echo:masterfrom

rfs/echo-cli-env-fixMerit-Systems/echo:rfs/echo-cli-env-fixCopy head branch name to clipboard