master-qa-6177

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