master-qa-8355

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