LPS-44709, LPS-44347, LPS-44701

Hi Brian,

the same pull as https://github.com/brianchandotcom/liferay-portal/pull/17074 + renamed the constants.

Thanks.