59401274 rebase and fix pull request  168

Also added user and pipeline_id as an attribute to the ContextService and Context class,