Fix for NMS-6165 - possible thread contention checking datacollection-config.xml
Merge remote-tracking branch 'origin/1.12'