Better target device naming on common hosts
    
    Import same logic as in falkor.xml.j2 to avoid trailing dots and
    duplicate naming.
    
    Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>