Revert "Bring berkshelf specs up to the latest chef-zero"

This reverts commit c4deafcbe78978a77007fae43dfb4e630982991c.