master-qa-5998

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