merge changes for STORM-1831

autobuild.xml

doc/contributions.txt

indra/cmake/GStreamer010Plugin.cmake

indra/cmake/LLPrimitive.cmake

indra/llui/llkeywords.cpp

indra/llui/llkeywords.h

indra/llui/lltextbase.cpp

indra/llui/lltexteditor.cpp

indra/llui/lltexteditor.h

indra/newview/CMakeLists.txt

indra/newview/app_settings/keywords.ini

indra/newview/app_settings/keywords_lsl_default.xml

indra/newview/app_settings/llsd-lsl-syntax.rng

indra/newview/llappviewer.cpp

indra/newview/llfloaterabout.cpp

indra/newview/llfloaterbulkpermission.cpp

indra/newview/llfloatergotoline.cpp

indra/newview/llpreviewscript.cpp

indra/newview/llpreviewscript.h

indra/newview/llscripteditor.cpp