Merge "[DMAAP-BC] Update incorrect topic values"