If admin_token is not specified in api_server.conf, let the default be None
Dont use VRRP Mac as source-mac in ethernet packets.
Add vhost-interface in Agent structure and use vhost-ip as smac
Merge pull request #548 from Juniper/praneet_defadmintoken

If admin_token is not specified in api_server.conf, let the default be N...
Fix a typo that was causing ingress acl to not get updated
Flowseries UT code
1. Add database operation and error statistics to cdb
2. Cleanup cdb library code
3. Cleanup generator message statistics
4. Added test in cdb and viz message for the same
Merge pull request #557 from Juniper/meghb_cdb_stats_and_cleanup

1. Add database operation and error statistics to cdb
Handle case where RoutingInstance is deleted when processing subscribe.

Previously we would go ahead and process the subscribe even if routing
instance was marked deleted.  Some of the tables in the instance may
already have been deleted.  This would obviously cause problems later
since the agent wouldn't really have been subscribed per the membership
manager.

Fix is to add instance to the vrf membership request map and process it
as a deferred subscription request when the instance gets created later.

Also take care of the case where we get an unsubscribe when the instance
is marked deleted.  If the instance is not in the vrf membership request
map, we process the unsubscribe as normal.  Otherwise we just remove it
from the vrf membership request map and flush any entries on the DeferQ.

Add tests to recreate the issue and verify the fix.
Added contrail-svc-monitor
Merge branch 'master' into ted-novenv
Default params are commented out
Performance optimizations in neutron/api-server for
          * adding query param option in GET collection for reading back in detail
            + corresponding api-lib changes for this
          * adding query param option in GET collection for reading back based on
            list of parent-anchor(s), back-ref-anchor(s), obj-uuids
            + corresponding api-lib changes for this
          * api-server changes to read back using multiget from cassandra
          * caching uuid to fq_name in api-server
          * profiling support in api-server (disabled pending packaging changes for
            GreenletProfiler)
          * Handle the fact dbe_read returns array in dbe_resync

- Ajay's changes
Merge pull request #560 from Juniper/praneet_ajay_perf

Performance optimizations in neutron/api-server for
Merge pull request #558 from Juniper/ted-novenv

added svc-monitor's entry point
Merge pull request #559 from Juniper/nsheth_xmpp_deferq

Handle case where RoutingInstance is deleted when processing subscribe.
Fix error in setting vhost-interface pointer in agent
Merge pull request #554 from praveenkv/master

Dont use VRRP Mac as source-mac in ethernet packets.
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