master-qa-6335

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