Fix test concurrency issue, part two
Merge branch 'master' of github.com:finnishtransportagency/digiroad2