Patches for check_icmp with TOS set-option [sf#2001832] [#916]