Bug 4993/int/4994 rudder init and upgrade remote connexion aware

This replaces PR #358, with the small changes requested