master-qa-8358

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