Merge "Handle HTTP 415 in rest_client"