Merge changes from topics "nonAutoIPSelection", "preferredIpProtocol"

* changes:
  Test IP version and encap type set in non-auto IP selection mode
  Test reading preferred IP protocol from carrierconfig