Merge pull request #3888 from gilles-peskine-arm/error-include-string-2.7

Backport 2.7: Fix several configuration-related issues