[#2006] Correctly handle HttpMessage / HttpContent implementations