Remove bottle as an idependent package
Merge pull request #563 from pedro-r-marques/pmaster

Remove bottle as an idependent package
Refer to https://github.com/Juniper/contrail-controller/pull/562. New commit due to change in file name btw R105 and mainline
Merge pull request #564 from Juniper/zoo_exit

Refer to https://github.com/Juniper/contrail-controller/pull/562.
Changes to take MAC of vhost and physical ports from Interface structure
instead of reading again from IOCTL.

Remove unused 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.
Configuration format changes for the vnswad
vnswad now take configuration in the standard ini format.
Default configuration file is read off /etc/contrail/vnswad.conf

One can override the values from the config file through command line option.
The list of vnswad configuration parameters are specified in src/vnsw/agent/test/vnswad.conf
Merge branch 'ashoksr_ini_new' of github.com:Juniper/contrail-controller into ashoksr_ini_new