[CHEF-4123] fix arity mismatches for ruby 1.8
Merge branch 'CHEF-4123-10-stable' into 10-stable