Make chef and chef-solo jigs use the same hierarchy
Merge pull request #61 from VictorLowther/pull-req-master-bbc20a06dbbdfd0b2f1725d18b4220bf28a9a536

https://github.com/crowbar/barclamp-test/pull/61

Merged by devtool for cloudedge
Rework attribs to align with crowbar barclamp changes.
Merge pull request #62 from VictorLowther/pull-req-master-a5df278b8c055255c255e395c0bbfbf2cf28a449

Start rework of attribs to improve data isolation during annealing [3/3]