merge from eosc_services
merged branch dsm into trunk
codebase used to migrate to java8 the production system