master-qa-4586

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