LPS-45564

Notes concerning the pull can be found on https://github.com/jonathanmccann/liferay-portal/pull/230