Merge remote-tracking branch 'origin/feature/10339_MaskBTP_SXD'
Merge remote-tracking branch 'origin/feature/10265_refl_detector_rotated'
Merge remote-tracking branch 'origin/feature/8802_convolve_option_for_conv_fit'
Fix race condition in ParameterMap

If threads are competing to try and both check and update the map then
they will hit the appropriate PARALLEL_CRITICAL sections within the
relevant methods. The bug was that the critical sections all had different
names and so OpenMP would not block on an ::add while a ::get is being
performed. The critical secctions are renamed to reflect the what
they are protecting.
Refs #10375
Fix up whitespace in ParameterMap.cpp

Refs #10375
Merge branch 'bugfix/10375_parameter_map_race_condition' into develop