merge -r 56842:57026 maintenance.

indra/llcommon/llfasttimer.h

indra/llimage/llimagej2c.cpp

indra/llmessage/llpumpio.cpp

indra/llmessage/llurlrequest.cpp

indra/llwindow/llkeyboard.cpp

indra/llwindow/llkeyboardwin32.cpp

indra/newview/llfasttimerview.cpp

indra/newview/llfasttimerview.h

indra/newview/llfeaturemanager.cpp

indra/newview/llfeaturemanager.h

indra/newview/llflexibleobject.cpp

indra/newview/llfloaterland.cpp

indra/newview/llfloaterland.h

indra/newview/llfloatertools.cpp

indra/newview/llfloatertools.h

indra/newview/llmanip.cpp

indra/newview/llstartup.cpp

indra/newview/llviewercontrol.cpp

indra/newview/llviewercontrol.h

indra/newview/llviewerparcelmgr.cpp