Merge "Fix bug associated with DMAAP listener properties"