Fixed a race condition in a content service test
Merge branch 'anurse-fixtestrace' into dev