Revert "Merge branch 'feat/context-service' into 'master'" See merge request teraflow-h2020/controller!4