Merge fix for DEV-39832

indra/llcommon/llerrorcontrol.h

indra/llcommon/llversionserver.h

indra/llcommon/llversionviewer.h

indra/llplugin/llpluginclassmedia.cpp

indra/llplugin/llpluginclassmedia.h

indra/media_plugins/quicktime/media_plugin_quicktime.cpp

indra/newview/English.lproj/InfoPlist.strings

indra/newview/Info-SecondLife.plist

indra/newview/app_settings/settings.xml

indra/newview/llmediadataclient.cpp

indra/newview/llviewermedia.cpp

indra/newview/llviewermediafocus.cpp

indra/newview/res/viewerRes.rc

indra/newview/tests/llmediadataclient_test.cpp

indra/newview/viewer_manifest.py

indra/test_apps/llplugintest/CMakeLists.txt

indra/test_apps/llplugintest/llmediaplugintest.cpp