Merge changes from topics "kpFromCarrier", "noNetCapNoMigration"

* changes:
  Prevent migrating the session from using the wrong value
  Read NAT keepalive value from carrier config