merges from chef-client - upstream