[Backport 2.8] fix for concurrentmodificationexception with linkedhashmap

[sbcd90]

backports #1255

Issue #, if available:

Description of changes:
fix for concurrentmodificationexception with linkedhashmap

CheckList:

• Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (b887104) 75.18% compared to head (3bfb0fd) 75.33%.
Report is 1 commits behind head on 2.8.

Additional details and impacted files

@@             Coverage Diff              @@
##                2.8    #1329      +/-   ##
============================================
+ Coverage     75.18%   75.33%   +0.15%     
  Complexity      116      116              
============================================
  Files           141      141              
  Lines          8422     8426       +4     
  Branches       1204     1205       +1     
============================================
+ Hits           6332     6348      +16     
+ Misses         1480     1471       -9     
+ Partials        610      607       -3     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.