add environment variable to enable logging during tests
Merge pull request #2587 from mbroadst/add-logging-env-var

add environment variable to enable logging during tests
Merge remote-tracking branch 'upstream/master'