PR revies fixes
Merge pull request #405 from telefonicaid/task/392_servicePath_rest_of_queryContext

Task/392 service path rest of query context
Merge pull request #407 from telefonicaid/task/392_servicePath_ServicePath_unit_tests

Task/392 service path service path unit tests
Merge branch 'feature/392_servicePath_in_query_update_context' into task/392_servicePath_merge_with_develop