master-qa-6619

http://issues.liferay.com/browse/LIFERAYQA-6619