[FORWARD PORT] LPS-50608 use correct identifier / finder

This is a forward port of https://github.com/sergiogonzalez/liferay-plugins-ee/pull/108