[OLINGO-317] Integration into tecsvc
[OLINGO-317] Merge feature branch into master