Do not connect to keystone for token if multi-tenancy is off
Merge pull request #178 from Juniper/bugs

Send Cpu and Memory info via new interface for statsOracle
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