master-qa-5994

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