master-qa-8359

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