Do not connect to keystone for token if multi-tenancy is off
Update L3 services based on ipv4_forwarding flag
Update failing test case
Do not use pointer to the iterator in the boost::bind arg list, as the contents may be moved by map.
Use correct vrrp mac
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Do not allocate mpls label in case of fabric_port
Send Cpu and Memory info via new interface for statsOracle
Merge pull request #175 from haripk/master

Bug fixes
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.