Merge pull request #2668 from c-po/current
frr: T4020: re-enable watchfrr in config as it is always running