Merge "Automation adds so-adapters-so-cnf-adapter.yaml"