Updated include_recipes to use proper cb name

We will want to update the attributes to the proper new naming,
but for now, updated include_recipe to match the actual cb name.
Also, brought in berkshelf 2.x since it is used across rest of
cookbooks, and updated Berkfile to our standard.

Change-Id: Ic13eb27eb471d15b8a3f7dd38318c4ba0033ed69