juju: sidestep the brewing gofmt war
Without ignoring the fact we need to resolve policy around gofmt, and possibly publish documentation on how to gofmt code consistently, this proposal slightly rearranges bootstrap.go to avoid the revert war.
R=john.meinel, niemeyer
CC=
https://codereview.appspot.com/6845096