Merge remote-tracking branch 'opensourcerouting/cmaster-next-vty2' into cmaster-next

Conflicts:
	watchquagga/watchquagga.c

diff --cc watchquagga/watchquagga.c
index cb9d50ff88af5ef687480f1c9d82d99e8ca296fa,93bbb0429a5140e6af8be06458cefba4b4c2f9e6..16b398030e1a080950c5120fb3f39a3b8f72783b
--- 1/watchquagga/watchquagga.c
--- 2/watchquagga/watchquagga.c
+++ b/watchquagga/watchquagga.c
@@@ -1306,7 -1301,17 +1324,16 @@@ main(int argc, char **argv
      }
        
    gs.restart.interval = gs.min_restart_interval;
+ 
+   zprivs_init (&watchquagga_privs);
+ 
    master = thread_master_create();
 -  systemd_send_started (master, 0);
+   cmd_init(-1);
+   memory_init();
+   vty_init(master);
+   watchquagga_vty_init();
+   vty_serv_sock(NULL, 0, WATCHQUAGGA_VTYSH_PATH);
+ 
    signal_init (master, array_size(my_signals), my_signals);
    srandom(time(NULL));