master-qa-8357

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