merge fix for STORM-588

etc/message.xml

indra/llui/lllineeditor.cpp

indra/llui/lltextbase.cpp

indra/newview/CMakeLists.txt

indra/newview/llfloaterregiondebugconsole.cpp

indra/newview/llfloaterregiondebugconsole.h

indra/newview/llviewerfloaterreg.cpp

indra/newview/llviewerregion.cpp

...iew/skins/default/xui/en/floater_region_debug_console.xml

indra/newview/skins/default/xui/en/menu_viewer.xml

...wview/skins/default/xui/en/panel_preferences_advanced.xml