master-qa-6341

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