Merge latest changes from Juniper/contrail-test master branch
Merge pull request #191 from vedujoshi/master

Merge latest changes from Juniper/contrail-test master branch