Various Fixes

Fixes found while integration testing Omnibus 4.0 with `chef` and `chefdk`.

/cc @opscode/release-engineers