Use the new HttpContent.
Add test case for bug #20583.