Manual merge of http-deadline vs. timeout flag change from lightpriest.
Manual merge of http-deadline vs. timeout flag change from lightpriest.

elijah/chef-prometheus,rayrod2030/chef-prometheus,elijah/chef-prometheus,rayrod2030/chef-prometheus,elijah/chef-prometheus,rayrod2030/chef-prometheus