Comment 2 for bug 787957

In combination with the parent and grandparent changesets, this should fix the problem: http://metanav.uninett.no/hg/default/rev/4dc5f4691bd9

BUT: The H3C switch still appears to report no trunk ports, but multiple untagged VLANs on a port not configured as trunk.

Until we figure out what's going on with the test switch, this can't really be considered fixed. The mentioned changes do clean the affected code a great deal, and the old behavior was kept, so we'll leave this in for now.