Ensure SubjectInfo addIdentity replaces a NULL Identity if it is present

Sometime SubjectInfo may contain a null identity as a place holder. If we adding a non-null identity and the subjectinfo contains a null identity, it should be removed to make place for the new identity.