Remove DisplayName option

Remove the option to set an environ user's display name from the
AddEnvirionmentUser function. Update call sites and expected test
results.
Merge pull request #696 from wallyworld/keep-broken-part-2

Do not stop bootstrap instance on error if keep-broken flag is true

Fixes: https://bugs.launchpad.net/bugs/1365772

The --keep-broken flag was added for 1.20.7 and it did stop the environment from being destroyed on a failed bootstrap, but did not stop the bootstrap instance from being stopped. This PR adds in the extra logic to do that.
cmd/jujud: don't redirect bootstrap-state logs

Redirecting bootstrap logs breaks bootstrap error reporting.

Fixes https://bugs.launchpad.net/juju-core/+bug/1366650
cmd/jujud: log stack trace on panic
Fix tests
Merge pull request #701 from wallyworld/keep-broken-part-2-trunk

Merge pull request #696 from wallyworld/keep-broken-part-2

Port from 1.20

Do not stop bootstrap instance on error if keep-broken flag is true

Fixes: https://bugs.launchpad.net/bugs/1365772

The --keep-broken flag was added for 1.20.7 and it did stop the environment from being destroyed on a failed bootstrap, but did not stop the bootstrap instance from being stopped. This PR adds in the extra logic to do that.
Merge branch 'master' of https://github.com/juju/juju into remove-display-name
Merge pull request #691 from waigani/remove-display-name

Remove DisplayName option

Remove the option to set an environ user's display name from the
AddEnvirionmentUser function. Update call sites and expected test
results.
Remove AddAdminUser and create the user when the environment is created.
Merge pull request #695 from howbazaar/remove-add-admin-user

Remove AddAdminUser and create the user when the environment is created.

The admin user is now created when the environment is created as part of the state initialization function.
The admin user also has an environment user record added for the initial environment.
provider/openstack: update goose

Fixes LP #1365480
Merge pull request #698 from axw/lp1366650-bootstrap-no-log-redirection

cmd/jujud: don't redirect bootstrap-state logs

Redirecting bootstrap logs breaks bootstrap error reporting.

Fixes https://bugs.launchpad.net/juju-core/+bug/1366650
Merge pull request #703 from davecheney/195-update-to-latest-goose

provider/openstack: update goose

Fixes LP #1365480
state: added functionality for aborting upgrades

UpgradeInfo now has an Abort method for cancelling the current
upgrade.
Use backticks to clean up UpgradeInfo tests