Chef 12 bootstrap cleanup

@opscode/client-engineers wanted to share this before increasing the spec coverage around these options. Thoughts?

Remaining work:

* [ ] Moar specs.
* [ ] End to End bootstrap testing
* [ ] CHANGELOG and RELEASE_NOTES updates.