merge from eosc_services
using dsm_datasources in sql expressions
integrated (hopefully) all required changes from dnet40
codebase used to migrate to java8 the production system