Fix problem with mac /locations_id on switch inventory. closes #2756

Conflicts:
	inc/formatconvert.class.php