Merge "remove mso-cnf-adapter from so Issue-ID: SO-3534"