Issue #1977632 by helmo: Fixed Confusion between code and coment --include-path vs. --include-paths.
Issue #1956712 by greg.1.anderson: fix over-isolation of test environment when test specifies additional environment settings. Partial backport of 9f413ea5c2f4cec81fae469296fb6cdda5ec0a18.