KFSUPGRADE-993 : merged to master. fix some address fields not being
populated to KFS.