master-qa-10728

https://issues.liferay.com/browse/LIFERAYQA-10728

FYI the master pull for this having one less commit than ee-6.2.x/ee-6.2.10 is expected and not a mistake.