master-qa-6834

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