[BISERVER-11485] - ConcurrentModificationException in AggregateObjectFactory - Using ReadWriteLock to ensure best performance