itstool 2.0.0
normalize/num-utils conflict
ndiff/nmap conflict
pdftohtml/poppler conflict
lci/lolcode conflict
md5sha1sum/polarssl conflict
libzzip/zzuf conflict
cc65/grc conflict
fastbit 1.3.8
fastbit/salt conflict
json_spirit 4.07

Closes #24227.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
unixodbc/virtuoso conflict
grc: nuke old comment
fastbit/pam_yubico conflict