Some more cleanup; No functional chagnes.

Signed-off-by: Venkateswararao Jujjuri "<jvrao@linux.vnet.ibm.com>
Removed cfd_clientid.

Signed-off-by: Venkateswararao Jujjuri "<jvrao@linux.vnet.ibm.com>
Compare deleg_clientid and candidate_clientid in chk_deleg_conflict

Signed-off-by: Venkateswararao Jujjuri "<jvrao@linux.vnet.ibm.com>