Moved development db connection directives into instance config
Merge branch 'master' into release-1.3.9