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
Fix build break in xen

Build breaks in xen ddk as endian.h does not have be64toh and its friends defined there.
Replace them with macros that does the same functionality

Signed-off-by: Anirban Chakraborty <abchak@juniper.com>
Merge pull request #581 from anirban-c/master

Fix build break in xen
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
UT was failing for the following reasons
-In Oper Interface Add path the GetOSParams API used to invoke get_table() which returns NULL. The table object is used to fetch agent object
-In KSync Nexthop delete path while setting setting Encap info the vhost_interface object accessed from Agent object was NULL.

Fix
-Pass agent object to GetOSParams in Add path.
-For Nexthop delete vrouter does not need anything apart from NH-index. Don't encode anything apart from NH-id in NH delete request msg.
Merge branch 'ashoksr_ut' of github.com:Juniper/contrail-controller into ashoksr_ut