Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llviewermessage.cpp
# indra/newview/skins/default/xui/en/strings.xml