Merge "Utility improvements for handling V6 encap and XFRM_MIGRATE"