master-qa-8829

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