Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
* Fix xmpp test case failure, due to wrong peer comparision
* Fix test acl failure, since port match is ignored for TCP and UDP flows
* Upon interface config deletion, delete interface nexthop
* Test case for same
Flowseries UT code
Merge pull request #566 from praveenkv/master

Changes to take MAC of vhost and physical ports from Interface structure
Handle case where BgpTable is deleted when processing subscribe.

Fix bug in membership manager that caused clients to wait forever
after requesting a register on a deleted table.  We now consider
the registration to be complete right away if the table's deleted
and invoke the client's completion routine.

Add tests to recreate the issue and verify the fix.
Merge pull request #567 from Juniper/nsheth_xmpp_deferq

Handle case where BgpTable is deleted when processing subscribe.
Merge pull request #556 from Juniper/sundar_qe_ut

Flowseries UT code
Added systemless test case for Specify vrouter in select.
Merge pull request #568 from Juniper/shabbir_dev1

Added systemless test case for Specify vrouter in select.
1. Generator database timer creation/deletion is done from
   generator connect session, disconnect session, database error
   handler. These can happen concurrently, synchronize by taking
   per generator mutex.
2. Generator db handler init, shutdown, and dequeue can happen
   concurrently. Enqueue a task to perform the init and ensure
   that these do not happen concurrently.
3. Cdb if now supports only_sync option that is used by
   query engine and when used does not create the cdbq.
Add a couple more tests for deferred xmpp peer close.

This covers scenarios where an xmpp peer has pending subscribe or
unsubscribe requests to the membership manager when xmpp channel
gets closed. We wait for completion notifications for outstanding
requests from the membership manager before triggering peer close
procedures.

Also add more peer membership verifications to existing tests.
We need to prevent generators with the old <S:M> style of key from connecting to a vizd with the new <S:N:M:I> key
Merge pull request #571 from Juniper/anishm_upfix

We need to prevent generators with the old <S:M> style of key from conne...
QueryEngine uses only_sync cdbif
Instantiate classes instead of executing python to launch config daemons
Merge pull request #570 from Juniper/meghb_2773

1. Generator database timer creation/deletion is done from
Merge pull request #573 from Juniper/sb

Instantiate classes instead of executing python to launch config daemons