Additional work done as part of merge: - Run ./tests/scripts/check-generated-files.sh and check in the resulting changes to programs/ssl/query_config.c