Update for Berkshelf 2.x -> 3.x