master-qa-6398

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