master-qa-7827

https://issues.liferay.com/browse/LIFERAYQA-7827

This commit is already in ee-6.2.x. I cherry-picked it to master and ee-6.2.10.