Cherry-pick: MCP bug fixes to release/2.0 (#3294, #3303)#3503

RubenCerna2079 merged 5 commits intorelease/2.0Azure/data-api-builder:release/2.0from

cherry-pick/release-2.0/mcp-bug-fixesAzure/data-api-builder:cherry-pick/release-2.0/mcp-bug-fixesCopy head branch name to clipboard