Omnibus 4.0 Fixes

/cc @opscode/release-engineers @opscode/client-engineers