This is mainly to fix CVE-2009-3563, a remote DOS. MFC after: 3 days Security: CVE-2009-3563
please see CommitLog for detailed changes. XXX html/build/hints/solaris.xtra.4095849 is not being imported as it conflicts with the detect-merge-conflict.sh script in our repo.