CHEF-1707: backport of fixes from master (chef-11.x)