LPS-45492

Resubmit which doesn't change log messages, except for one instance where the log messages aren't consistent with the rest of Liferay