master-qa-6399

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