Merge branch 'nd/trace-with-env'

Code cleanup. * nd/trace-with-env: run-command: use strbuf_addstr() for adding a string to a strbuf