master-qa-7380

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