Modified transport connect timeout so that it doesn't add over multiple negotiate requests

#2738
Made changes as per code review feedback

#2738
Merge branch 'release' into dev