fix chef bootstrap
Merge branch 'upstream'
fix colors
add missing ohai plugin
add missing ohai plugin
Merge branch 'upstream'