master-qa-8380

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