Merge "Revert "[DCAEGEN2] Add external configmaps""