fix client connection registration with wrong address
Merge pull request #4189 from sancar/fix/clientAwsRegisteringWrongAddress/maint3.x

fix client connection registration with wrong address