Add the FQDN information to the arbiter.

r=Rémy Hubscher
Merge remote-tracking branch 'upstream/master'