Merge remote-tracking branch 'singu/master'

Conflicts:
	indra/newview/llvoavatar.cpp

Bug fix is no longer needed.

indra/llmessage/aihttptimeoutpolicy.cpp

@@ -824,7 +824,9 @@ AIHTTPTimeoutPolicy const* AIHTTPTimeoutPolicy::getTimeoutPolicyByName(std::stri
 // Policy name									Policy
 P(accountingCostResponder);
 P(agentStateResponder);
+P(appearanceChangeMetricsResponder);
 P(assetUploadResponder);
+P(assetReportHandler);
 P(asyncConsoleResponder);
 P(avatarPickerResponder);
 P(authHandler);
@@ -834,6 +836,7 @@ P(blockingLLSDPost);
 P(blockingLLSDGet);
 P(blockingRawGet);
 P(charactersResponder);
+P(checkAgentAppearanceServiceResponder);
 P(classifiedStatsResponder);
 P(consoleResponder);
 P2(crashLoggerResponder,						transfer_5s);