Merge "Remove HAVE_{BSD,SOLARIS}_NETWORK -only code"