Chef 10 upgrade: remove uppercase-block-variable hack