fixes #3055
mock client fix
Merge pull request #3293 from sancar/fix/reuseUuidOnReconnect/maint3.x

Client uuid generation and registration fixed