Hostnames in xml output

Change-Id: Id4cdccecd23295e3a63d379468f8270bfe598bfa