KFSUPGRADE-993 : fix missing address fields when populating to KFS