Update deps for utils package update
Merge pull request #551 from wallyworld/juju-utils-update-1.20

Update deps for utils package update

Fixes https://bugs.launchpad.net/bugs/1354685
cmd/jujud: avoid potential race for UpgradedToVersion

Store the initial UpgradedToVersion as the the machine agent starts up
and use that when deciding whether HA initialisation is
required. Previously it could have been possible for the upgrade-steps
worker to update UpgradedToVersion before ensureMongoServer got to
check it.
cmd/jujud: update upgradedToVersion even when upgrade mode is skipped

Recent changes to avoid entering "upgrade mode" unnecessarily have
meant that the upgradedToVersion field in a machine agent's config
wasnt't getting updated whenever upgrade mode is skipped. This can
have a variety of negative effects.

This change fixes that by writing the current version to agent.conf
when upgrade mode is skipped.
Merge pull request #569 from mjs/1359484-write-upgradedToVersion-even-when-no-upgrade-1.20

Write upgraded to version even when no upgrade (v1.20)

This is the 1.20 backport of https://github.com/juju/juju/pull/566.

See also: https://bugs.launchpad.net/juju-core/+bug/1359484
Merge pull request #574 from wallyworld/use-floatingip-as-public-address

Ensure floating IP is used as public address for openstack

Fixes https://bugs.launchpad.net/juju-core/+bug/1348287

If a floating IP address is requested for an Openstack instance, we know that will be the public address. That one should be reported as such instead of trying to guess. Often the guesses can be wrong.
Tweak formatting
Merge pull request #578 from wallyworld/use-floatingip-as-public-address-1.20

Merge pull request #574 from wallyworld/use-floatingip-as-public-address

Backport from trunk

Ensure floating IP is used as public address for openstack

Fixes https://bugs.launchpad.net/juju-core/+bug/1348287

If a floating IP address is requested for an Openstack instance, we know that will be the public address. That one should be reported as such instead of trying to guess. Often the guesses can be wrong.
Merge pull request #568 from howbazaar/fix-envcmd-ensure

Envcmd is more forgiving during init.

Don't error in envcmd if we can't work out the environment until we actually need it.
Backport devel makefile to stable for consistent testing.
Merge pull request #583 from sinzui/backport-makefile-for-testing

Backport devel makefile to stable for consistent testing.
Resolve conflicts
Merge pull request #580 from wallyworld/fix-envcmd-ensure-1.20

Merge pull request #568 from howbazaar/fix-envcmd-ensure

Backport from trunk

Envcmd is more forgiving during init.

Don't error in envcmd if we can't work out the environment until we actually need it.
Update dependencies to use gomaasapi rev 53
Fix a couple of nil pointer errors
Merge pull request #585 from wallyworld/gomaasapi-rev53

Update dependencies to use gomaasapi rev 53

New gomaasapi revision.

Fixes: https://bugs.launchpad.net/bugs/1190986
Upgrade selection increments minor version by 1
Merge pull request #588 from wallyworld/nil-pointer-fixes-1.20

Fix a couple of nil pointer errors

Backport some fixes from trunk.

Fixes:
https://bugs.launchpad.net/bugs/1357482
https://bugs.launchpad.net/bugs/1358585
Add environment UUID in placement directives
Merge pull request #589 from wallyworld/next-upgrade-version

Upgrade selection increments minor version by 1

Fixes: https://bugs.launchpad.net/juju-core/+bug/1359435

When we upgrade and Juju chooses the next version, it now needs to increment minor version by 1 not 2.