4680.	[bug]		Fix failing over to another master server address when
			nsupdate is used with GSS-API. [RT #45380]

9.9.12, 9.10.7, 9.11.3, 9.12.0

The merged fix does not include preferring IPv6 over IPv4 in local-only
mode as this breaks some nsupdate system tests (due to the tested named
instances listening on 127.0.0.1, but not on ::1).  I might fix that in
another ticket.