master-bc-2449

https://issues.liferay.com/browse/LIFERAYQA-10315

This is a re-sending of:
https://github.com/brianchandotcom/liferay-portal/pull/20916
https://github.com/brianchandotcom/liferay-portal-ee/pull/6714
https://github.com/brianchandotcom/liferay-portal-ee/pull/6715