1. Use strtoX instead of stringstream in stringToInteger since it
   is about 20x faster.
2. Fix scons .
- accomodate header rename
Merge pull request #659 from praveenkv/master

Compute tunnel_type_ in route path for VGW routes.
Merge pull request #650 from Juniper/fix

- accomodate header rename
backward compatibility of contrail-analytics-api
Merge branch 'master' into ted-opsvr
Limit the number of flows per VM based on agent configuration
make max_vm_flows as a % of overall flows
Merge pull request #664 from praveenkv/master

Use interface-name instaed of interface-index when deleting vgw interfac...
Merge pull request #665 from praveenkv/master

Interface and VRF are mandatory arguments only for VGW create
fix test case build error
Merge pull request #662 from haripk/master

Limit the number of flows per VM based on agent configuration
Merge pull request #647 from Juniper/meghb_stoi

1. Use strtoX instead of stringstream in stringToInteger since it
Merge pull request #661 from Juniper/ted-opsvr

opsvr: backward compatibility of contrail-analytics-api
Add cdb tests for encode/decode composite/non-composite types
developed while debugging bug 2886
Merge pull request #668 from Juniper/meghb_gendb_test

Add cdb tests for encode/decode composite/non-composite types
- Fix for #2886 - Wrong initialization of ObjectTable in QE caused improper decoding and hence query failure.
Merge pull request #669 from Juniper/pr_2886

- Fix for #2886 - Wrong initialization of ObjectTable in QE caused impro...