Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
* Fix xmpp test case failure, due to wrong peer comparision
* Fix test acl failure, since port match is ignored for TCP and UDP flows
* Upon interface config deletion, delete interface nexthop
* Test case for same
Merge remote branch 'upstream/master'
* Delete l2 interfaces NH, if layer2 forwarding gets disabled
* Delete l3 nexthop upon interface deactivation
Merge remote branch 'upstream/master'
* Address review comments
* Add more interface activate deactivate test case for nexthop deletion
Merge pull request #555 from naveen-n/master

Upon interface config delete, delete interface NH