Fix resolution of data bag hashes where the included bag attributes are at the top level

If I have a bag reference, I would like the referenced bag to be able to live at the top level of the data bag.