Merge "mso-cnf-adapter changes for docker tag name Issue-ID: SO-3518"