Merge cookbook and cookbook/metadata packages