Merge branch 'master' of https://github.com:/wiad/librenms into issue-2708

Conflicts:
	includes/definitions.inc.php

html/includes/functions.inc.php

@@ -209,6 +209,8 @@ function generate_device_link($device, $text=null, $vars=array(), $start=0, $end
         $text = $device['hostname'];
     }
 
+    $text = ip_to_sysname($device,$text);
+
     if (isset($config['os'][$device['os']]['over'])) {
         $graphs = $config['os'][$device['os']]['over'];
     }