master-qa-8129

https://issues.liferay.com/browse/LIFERAYQA-8129
https://issues.liferay.com/browse/LIFERAYQA-8132

master PR is different from ee-6.2.x/ee-6.2.10 even though the commits appear to be the same because the master PR modifies a file that was renamed in master but not in ee-6.2.x/ee-6.2.10.