master-qa-6496

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