merge changes for DRTVWR-285

.hgtags

BuildParams

doc/contributions.txt

indra/cmake/BuildVersion.cmake

indra/lib/python/indra/util/llmanifest.py

indra/llcommon/tests/llprocess_test.cpp

indra/llui/llfloaterreg.cpp

indra/llui/llnotifications.cpp

indra/llui/lltexteditor.cpp

indra/llui/lltexteditor.h

indra/llvfs/lldir.h

indra/llxml/llcontrol.cpp

indra/llxml/llcontrol.h

indra/llxml/tests/llcontrol_test.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/cmd_line.xml

indra/newview/app_settings/settings.xml

indra/newview/app_settings/settings_files.xml

indra/newview/app_settings/settings_minimal.xml

indra/newview/linux_tools/wrapper.sh