1.7.1
(Backport from 2.0-dev) Fix in include file.
(Backport from 2.0-dev) Use file with awk instead of -e option.
These fix build and test run issues but there are no functionality changes from 1.7.
(Backport from 2.0-dev) Fix in include file.
(Backport from 2.0-dev) Use file with awk instead of -e option.
These fix build and test run issues but there are no functionality changes from 1.7.