Improve sample configuration files (bug #1125)