Handle super calls correctly in load_current_resource
Backport Chef patches into the cookbook