Fixes ConcurrentModificationException while removing PropertyDefinition
from the metadata mapping table