Fix location with entity -1 in snmp inventory. closes #2697

Conflicts:
	inc/formatconvert.class.php