Merge "[DMAAP-DR] Bug fix DCAEGEN2-2217 for Frankfurt release" into frankfurt