LPS-40374

LPS-40374 https://api.github.com/repos/Robert-Frampton/liferay-portal/pulls/LPS-40374