Merge "Fix DMAAP Bus Controller version"