master-qa-7381

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