master-qa-4311

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