Updated hosts file configs for new IPv6 in trusty
Merge branch 'master' into oneiric