BUG-2017 Fix possible concurrent modification ex in config subsystem