Fix topo devices with same short_name

Display devices in the topology map with the same short_name as
distinct nodes.

Fixes redmine #1822