Release (Maint YZ) -> Maint A merge

[marchcat]

# Conflicts:
#   autobuild.xml
#   indra/llimage/llimage.cpp
#   indra/llui/llsearcheditor.cpp
#   indra/llui/llview.cpp
#   indra/newview/llagent.cpp
#   indra/newview/llappviewer.cpp
#   indra/newview/llfloatercamera.cpp
#   indra/newview/llfloatereditsky.cpp
#   indra/newview/llfloatereditwater.cpp
#   indra/newview/llinventoryfunctions.cpp
#   indra/newview/lloutfitgallery.cpp
#   indra/newview/lloutfitslist.cpp
#   indra/newview/llpanelgroupbulkban.cpp
#   indra/newview/llsidepanelappearance.cpp
#   indra/newview/llvovolume.cpp