Merge pull request #892 from opensourcerouting/watchfrr-simplify

simplify watchfrr, add --terminal, improve startup logging

diff --cc configure.ac
Simple merge

diff --cc ldpd/lde.c
Simple merge

diff --cc lib/log.c
Simple merge

diff --cc lib/vty.c
Simple merge

diff --cc lib/vty.h
Simple merge

diff --cc watchfrr/watchfrr.c
Simple merge