Merge changes from topic "fix-ipsec-sp"

* changes:
  Use independent address families for SP selector and template
  Rename tunnel mode local/remote addresses to src/dst