Merge r259541 from stable/10: Merge r256868,257276-257277,257515,257913 from head. These are fixes required to make Xen buildable w/o INET.Approved by: re (delphij)