CHEF-4538

Suggested fix for 

CHEF-4538 https://tickets.opscode.com/browse/CHEF-4538#comment-39597

KNIFE-364 https://tickets.opscode.com/browse/KNIFE-364