Increasing the Cfg stale timeout from 2 minutes to 15 minutes
* Increase vrf delete timeout to 15 minutes
Merge pull request #317 from divakardhar/master

Increasing the Cfg stale timeout from 2 minutes to 15 minutes
Merge pull request #318 from naveen-n/master

* Increase vrf delete timeout to 15 minutes
Add tests for nova cfg connect/keepalive
Merge pull request #319 from Juniper/add_test_cases

Add tests for nova cfg connect/keepalive
fixing build break
Merge pull request #320 from Juniper/psethi_build_fix

fixing build break
Use the discovery client from api-venv instead of system discoveryclient
Merge pull request #321 from Juniper/rrugge-ocs

Use the discovery client from api-venv instead of system discoveryclient
* VGW routes to be exported with encap type MplsoGre only
* Check for the same in test case
* WHile exporting route, check if the particular encap type is set
  before exporting
Merge pull request #324 from naveen-n/master

* VGW routes to be exported with encap type MplsoGre only
Fixed an issue with the extraction of table name in delrequest.lua, because of which the UVE keys are not removed from the table in redis-uve.
Merge pull request #327 from Juniper/sundar_bug2293

Fix for #2293
Merge remote-tracking branch 'github/master' into ananth_commit