Replace CollectionUtils.indexOf, some, forEach and hasProperty with _.findIndex, some, foreach and has, respectively