master-qa-8322

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