Merge branch 'merge-handshake-and-transport-keys' into 'master'

Add support for handshake keys to KeyManager

See merge request !1088
1 job from master in 7 minutes and 11 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #3389
test

00:07:11