Merge change 21988 into donut

* changes:
  Add OS version to ping service (win/mac only)