FCREPO-1075: Applied Vincent's patch in order to avoid ConcurrentModificationsExceptions