Merge zipper config into the main config.

[grzkv]

After merging carbonapi and zipper, the configs stay separate. We need to merge them into a single one.