master-bc-2692

https://issues.liferay.com/browse/LIFERAYQA-11334

This is a resending of:
https://github.com/brianchandotcom/liferay-portal/pull/21469