merge fix for STORM-138

.hgtags

BuildParams

doc/contributions.txt

etc/message.xml

indra/cmake/Python.cmake

indra/cmake/TemplateCheck.cmake

indra/cmake/ViewerMiscLibs.cmake

indra/llcommon/llprocesslauncher.cpp

indra/llcommon/llprocesslauncher.h

indra/llui/lllineeditor.cpp

indra/llui/lltextbase.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/featuretable.txt

indra/newview/featuretable_linux.txt

indra/newview/featuretable_mac.txt

indra/newview/featuretable_xp.txt

indra/newview/llchathistory.cpp

indra/newview/llchatitemscontainerctrl.cpp

indra/newview/lldrawpoolwater.cpp