Merge "Fix the request wrapper for http requests served from plugins" into stable-2.9