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.
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.