Merge changes I67ba0379,Iced00bb4

* changes:
  clatd - preparation for ipv6 to ipv4 fragmentation translation
  clatd - pull in more fragmentation related stuff from kernel headers