Potential chefdk 3.5.6

@opscode/client-engineers These are the changes I needed to get a passing build with chef-dk master