DAO beans now declared on top level

Moved the definition of the DAO-related beans to the top level. This means that
the XML file with the service-local configuration no longer directly includes
the DAO configuration. This allows a different DAO configuration to be used in
unit tests.
Merge branch 'refactor-spring-cfg'