[TIMOB-13370] Ensure no concurrentModification Exception
Merge pull request #4123 from vishalduggal/timob-13370-31X

[TIMOB-13370] (3_1_X) Ensure no concurrentModification Exception