master-qa-6058

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