Increment juju to 1.20.2
Merge pull request #283 from sinzui/inc-1.20.2

Increment juju to 1.20.2

Update juju version and win installer to 1.20.2.
Backport instance harvesting fix from master
Merge pull request #323 from wallyworld/provisioner-destroys-instances-incorrectly-1.20

Backport instance harvesting fix from master

I messed up the backport last time.
Update to fix licence dependencies
Fix gnuflag rev
Merge pull request #324 from wallyworld/license-dependnecies-1.20

Update to fix licence dependencies

Update to fix licence dependencies
Update dependencies to pull in new repos with licensing fixed
Add new charm dep
Merge pull request #335 from wallyworld/more-licence-fixes-1.20

More licence fixes 1.20

This is required for compliance with the licensing rules to allow Juju to be included in trusty
state: only update API host ports if changed

If the API host ports haven't changed, don't
update them. This avoids spamming the transaction log
with unnecessary writes.

Fixes https://bugs.launchpad.net/juju-core/+bug/1345832
state: handle concurrent calls to SetAPIHostPorts
Merge pull request #349 from axw/state-setapihostports-ifchange-1.20

If the API host ports haven't changed, don't

update them. This avoids spamming the transaction log
with unnecessary writes.

(Cherry pick from trunk)

Fixes https://bugs.launchpad.net/juju-core/+bug/1345832
Backport: Bootstrap no longer cleans up if it can't tell whether an environment is bootstrapped or not.

Conflicts:
	cmd/juju/bootstrap.go
	cmd/juju/synctools.go
Merge pull request #350 from katco-/v1.20-backport

Backport: Bootstrap no longer cleans up if it can't tell whether an environment is bootstrapped or not.

https://bugs.launchpad.net/juju-core/+bug/1340893

Conflicts:
	cmd/juju/bootstrap.go
	cmd/juju/synctools.go
Adds the 'maas-bridge-interface' option to MAAS configuration
	- By default 'eth0' is used, but this fails on some setups like LP: #1271144 when
	using (p1p2, eth2, ..) interfaces.
- Minor fixes according to @wallyworld observations
- Fixed according to @axw comment.
	- For backward-compatibility, network-bridge is an empty string by default "eth0" will be returned.
Merge pull request #355 from axw/fix_1271144-1.20

Add 'network-bridge' option to MAAS configuration

I exposed the variable 'network-bridge'' to allow users to specify to which network interface
the bridge should be bound to.

MAAS provider uses 'eth0' as the default network interface used to build the bridge br0, on some scenarios like LP: #1271144 (p1p2, eth2, ..) this assertion is not true.
cmd/jujud: reattempt api.Open if IsCodeNotProvisioned

There is a race between the machine agent starting and
the provisioner recording its instance ID in state.
We modify the agent's logic around opening API
connections to retry for up to one minute if it receives
an error satisfying IsCodeNotProvisioned.

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