master-bc-3086

https://issues.liferay.com/browse/LIFERAYQA-12343

This is a re-sending of:
https://github.com/brianchandotcom/liferay-portal/pull/22599