Remove use of "DEBUG" env var from CLI and de-couple -D from --log-level Upstream-commit: 36d995a291c672205d1e8f93f19fb07de253c3d7 Component: engine