Merge "Tidy up MulticastSocketTest and fix execution on hammerhead"