Pending fix for bug 1310258

[Martin Packman]

I put up a branch to fix one of our 1.19.1 blocking bugs earlier today:

APIHostPorts returns 'localhost' and '127.0.0.1'
<https://bugs.launchpad.net/juju-core/+bug/1310258>
<https://codereview.appspot.com/90310043/>

As I'm on a plane for most of tomorrow, feel free to mark approved to
land if it gets reviewed. Otherwise, I'll try and follow up after I
land evening US (Mountain) time.

Martin