Merge "Refactor MulticastSocketTest to JUnit 4."