Merge "[DMAAP] Set default service name"