Fix instances of duplicate display-filter-names with incompatible types.

Backported (with no changes) from master c681091.
See: https://code.wireshark.org/review/5575

Note: Some of the filters, when/if used, could have caused Wireshark crashes.

Change-Id: I3b5afb8a59f6443624708b9fecfdcbe93dad59ef
Reviewed-on: https://code.wireshark.org/review/5590
Reviewed-by: Bill Meier <wmeier@newsguy.com>