ConfigManagement: Bug fixes for chef support.