[MERGE] URI tweaks

[Daniel Hartwig <mandyke@gmail.com>]

Hi

Some cleanup of URI display addressing minor issues:

  * apt-pkg/contrib/strutl.cc:
    - include port in URI::SiteOnly, URI::NoUserPassword to display in
      apt-cache policy, progress output, etc. thanks to James McCoy
      for the patch (Closes: #154868, #322074)

Along the same line it is probably sensible to close #317576 also by
eliminating the last ambiguous (or close to it) use of SiteOnly in
‘apt-get update’ output.  Most other uses of this function were
replaced by NoUserPassword some time ago.

  * methods/http.cc:
    - properly escape IP-literals (e.g. IPv6 address) when building
      Host headers and URIs (Closes: #620344)

  * methods/connect.cc:
    - clean up error messages, and use real URI format as appropriate
      (Closes: #603340, #703422)

There are two additional error messages related to getaddrinfo that
could be updated to show the base URI instead, but I left these for
now as they are rare and contain the exact data passed to the
function.


Unfuzzied translations where this was obvious enough.

Updated some test cases.

Regards