Update default configuration files
Merge pull request #2863 from cleishm/1.9-default-config

Update default configuration files