Fix lang for agent error. thanks Guillaume Rousse
Fix very big performances problem on computer inventory
Fix sql error. closes #2257
Fix problem with PCIID. closes #2286
Fix generation of discovery.xml when not created. closes #2281

Conflicts:
	inc/snmpmodelimportexport.class.php
Try to fix esx inventory problem. references #2277