Limit exposure to ConcurrentModificationException when sys props are replaced or mutated

Limit exposure to ConcurrentModificationException when sys props are replaced or mutated #20123