Fix race condition when using ParameterMap

Fixes issue [#10375](http://trac.mantidproject.org/mantid/ticket/10375)

Test will have to be a code review and confirmation that the system tests are now passing.