wireshark 1.8.7

Closes #20011.
Closes #20012.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>