[master] Finished merge of trac3697 (cryptic error on invalid config)

ChangeLog

+961.	[func]		fdupont
+	Improved error messages when handling invalid or malformed
+	configuration file. File and line number are printed, when
+	available.
+	(Trac #3697, git xxx)
+
 960.	[build]		fdupont
 	Get rid of the last bundy pieces of code.
 	(Trac #3732, git 6b7da42f902fabb6855e54a19ea472c18ba82a93)