Don't wait for upgrades to be checked when the network is unplugged, again.
Merge branch 'bugfix/6592-fix-races-with-check-for-upgrades' into experimental