Merge "Add identities for DMaap"