Move default config to config/install.
Merge remote-tracking branch 'origin/8.x-1.x' into gsoc-plugin

Fix to bug which was causing simpletest failures.