Cosmit
Merge branch 'master' into 5.6.0
NXP-9706: Remove TODO about file upload timeout
NXP-11917: Add handshake timeout parameter to Controller (default = 60s)
NXP-11917: Use handshake timeout for server binding
NXP-11917: Use usual timeout for server unbinding
NXP-11580: Display relevant message is case of connection timed out during bind server
Merge branch 'master' into 5.6.0