Unicode:  slight clarification on error message.
Merge topic 'configure_file-unicode' into next

23bed24b Unicode:  slight clarification on error message.
Unicode: check encoding of files given to configure_file.

UTF-16 and UTF-32 files are rejected.
Merge topic 'configure_file-unicode' into next

98383f80 Unicode: check encoding of files given to configure_file.