Do not connect to keystone for token if multi-tenancy is off
Send Cpu and Memory info via new interface for statsOracle
Merge branch 'master' into bugs
Fix typo in function name
Merge pull request #178 from Juniper/bugs

Send Cpu and Memory info via new interface for statsOracle
Fix for (Config) api-server's unit test
Import discovery client from discoveryclient package. If this fails, try from the server. TODO - Import from the server should be taken out
change a tab to whitespace
Do not use rpm commands in ubuntu
changing the replication factor to 2 for ContrailAnalytics keyspace.
Merge pull request #180 from Juniper/arvindv-development2

changing the replication factor to 2 for ContrailAnalytics keyspace.
Merge pull request #154 from Juniper/vncopenstack

Do not connect to keystone for token if multi-tenancy is off
Remove singleton definitions and references from UVE UT code
Merge pull request #182 from Juniper/bugs

Remove singleton definitions and references from UVE UT code
Fix failure in dhcp_test UT
Send both systemlog and LOG messages when reporting VRouter errors as response for object add/delete, kstate get/dump and stats collection dump requests
Merge branch 'master' into bugs
Merge pull request #183 from ashoksr/master

Fix failure in dhcp_test UT
add libcql library to third party libraries
Merge pull request #179 from Juniper/api-ut-fix

Fix for (Config) api-server's unit test