Merge pull request #3016 from c-po/nht
T6001: add option to disable next-hop-tracking resolve-via-default