Merge pull request #11965 from duglin/DEBUG

Remove use of "DEBUG" env var from CLI and de-couple -D from --log-level