Integrate minor changes in context service into develop See merge request teraflow-h2020/controller!10