CLOUDIFY-1335 avoid ConcurrentModificationException by not removing items from the currently iterated list