merge -r 57111:57464 maintenance.

indra/llui/llfloater.cpp

indra/llui/llmenugl.cpp

indra/llui/llmenugl.h

indra/llui/llscrolllistctrl.cpp

indra/llui/llscrolllistctrl.h

indra/llvfs/llvfs.cpp

indra/llwindow/llkeyboardwin32.cpp

indra/llwindow/llwindowwin32.cpp

indra/llxml/llcontrol.h

indra/newview/licenses-linux.txt

indra/newview/lldrawpoolalpha.cpp

indra/newview/llfloaterregioninfo.cpp

indra/newview/llfolderview.cpp

indra/newview/llnetmap.cpp

indra/newview/llpanelavatar.cpp

indra/newview/llpanelavatar.h

indra/newview/llpanelpermissions.cpp

indra/newview/llpreviewnotecard.cpp

indra/newview/llpreviewscript.cpp

indra/newview/llpreviewscript.h