Merge "Fix sonar issues in dmaap-dbcpi"