Additional change for clientid persistence.

Signed-off-by: Rong Zeng <rongzeng@us.ibm.com>
Merge branch 'tp/clientid_fix_S1051571' into ibm_next_tmp
Merge branch 'tp/ibm_next_S1053475' into ibm_next_tmp
Merge branch 'tp/S1051571_2' into ibm_next_tmp