Upgrade to Surefire 2.17 and remove workaround. Fix test setup.
Return IP address in predictable order with IPv4 first