Fix build.
Pick up chef-dk changes in omnibus-software.
Test with CC-44 of chef-dk.