Merge "Update dmaap to use logging context"