Merge changes from topics "nonAutoIPSelection", "preferredIpProtocol"

* changes:
  Honor IP protocol set by client in non-auto IP selection mode
  Read preferred IKE protocol from carrier config