Pushed to upstream

cc/ @robertoDiaz @sergioGonzalez. Fixing wiki tests, but there is a related change on WikiPageLSI in this pull: https://github.com/brianchandotcom/liferay-portal/pull/21308