Merge pull request #3886 from gilles-peskine-arm/error-include-string-2.16

Backport 2.16: Fix several configuration-related issues