Berkshelf support: Removing unneeded copies of upstream cookbooks.
Merge pull request #185 from cdearborn/pull-req-master-2917f065adfcbb5cab088c81b42217152bdc00c4

Berkshelf support: removed unneed copies of upstream cookbooks and enabled [2/5]