Merge changes I10c01f2b,Ie05bc535

* changes:
  Check to ensure UDP-encap is used only for IPv4
  Add UDP encapsulation tests for IpSecService.