Merge remote-tracking branch 'github/master' into curlthreading3

Conflicts:
	indra/aistatemachine/aistatemachine.cpp

indra/llmessage/llhttpclient.cpp

@@ -325,7 +325,6 @@ static LLSD blocking_request(
 			llwarns << "CURL REQ HEADERS: " << headers.asString() << llendl;
 			llwarns << "CURL REQ BODY: " << ostr.str() << llendl;
 			llwarns << "CURL HTTP_STATUS: " << http_status << llendl;
-			llwarns << "CURL ERROR: " << curlEasyRequest_w->getErrorString() << llendl;
 			llwarns << "CURL ERROR BODY: " << http_buffer.asString() << llendl;
 			response["body"] = http_buffer.asString();
 		}