Bug 1036210 - Recover the automatic connection once the manual connecon is failed r=eragonj
Merge pull request #24967 from crh0716/1036210_v2.1

Bug 1036210 - Recover the automatic connection once the manual connection is failed