Merge pull request #22599 from svic/Bug_1043856

Bug 1043856 - Increase connection timeout