Merging changes for unique client IDs
Reinstating fix to TLSHelpers
Authored by: i-campbell 2020-10-18
Parent: [r459]
Child: [r461]