Fix duplicates for other client identifiers v5

[ekigamba]

Address part of https://github.com/opensrp/support/issues/235 for client core v5