Merge changes I33e945f8,I9b5c9618

* changes:
  CTS: Verify rekey-based tunnel migration with encapType change
  Verify Kernel MOBIKE with V6 UDP encapsulation