master-qa-6335

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