Merge "add nssmf adpter endpoint and so infra endpoint, update the oof endpoint"