Merge "add new enableCADI flag to dmaapbc properties"