Consolidate some of the configuration.
Fix problem with Spring property placeholders