NMS-6019 make the timed out map thread-safe
Merge remote-tracking branch 'opennms/1.12'