Merge "DMAAP-DR - Additional parameter validation"