Tweak restart logic for IP address changes.
Merge branch 'master' into gsa