master-qa-6071

https://issues.liferay.com/browse/LIFERAYQA-6071