OPNFLWPLUG-970: Prevent ConcurrentModificationException when switches disconnected