Consolidate tunnel check into name check

Author: wvu

lib/msf/core/db_manager/import/nmap.rb

@@ -164,12 +164,7 @@ def import_nmap_xml(args={}, &block)
         data[:host]  = hobj || addr
         data[:info]  = extra if not extra.empty?
         data[:task]  = args[:task]
-        if p["name"]
-          data[:name] = p["name"]
-        end
-        if p['tunnel']
-          data[:name] = "#{p['tunnel']}/#{data['name'] || 'unknown'}"
-        end
+        data[:name]  = p['tunnel'] ? "#{p['tunnel']}/#{p['name'] || 'unknown'}" : p['name']
         report_service(data)
       }
       #Parse the scripts output