Last contribution pass before Chef 12.

/cc: @opscode/client-engineers