Eliminating concurrency related errors

Merged Adam Knapp requested to merge concurrency into master

Signed-off-by: Adam Knapp adam.knapp@ericsson.com

Merge request reports