Merge pull request #1761 from pmelange/ff_olsr_watchdog_del_tnl