Merge "Add mcp-qa group to cookiecutter extra content"