Merge "mso-cnf-adapter changes for docker tag name"