remove unused variable startup_type
Merge branch 'CHEF-4822' into contributions