Merge "Add mso-config to docker image build"