Merge change 22992 into eclair

* changes:
  Annotate tests that are failing due to legacy IP address formats that have not been implemented yet.