* Delete l2 interfaces NH, if layer2 forwarding gets disabled
* Delete l3 nexthop upon interface deactivation

* Address review comments
* Add more interface activate deactivate test case for nexthop deletion
(cherry picked from commit 517bace716f2c408cc705967895cf04422219d18)
* Ignore port number match for protocol other than tcp and udp.
* Test case for same
(cherry picked from commit 65bf79cafff752a0bacbc90156ba698e4670c691)
Merge branch 'R1.05' of https://github.com/Juniper/contrail-controller into R1.05
* Add vrf find api which takes an option to return deleted vrf