Merge "Use parsed HTML error responses instead of api-error-*"