am 5af421c4: Merge "Avoid using point-to-point interfaces in multicast socket tests"

* commit '5af421c4c7748df09884ca2683e2cb816a334053':
  Avoid using point-to-point interfaces in multicast socket tests