master-qa-4331-2

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