SL-6109 Conflict resolution

indra/llcommon/llkeybind.cpp

indra/llcommon/llkeybind.h

indra/llui/llscrolllistcell.cpp

indra/llui/llscrolllistcell.h

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/llfloaterpreference.h

indra/newview/llkeyconflict.cpp

indra/newview/llkeyconflict.h

indra/newview/lltool.cpp

indra/newview/lltoolpie.cpp

indra/newview/lltoolpie.h

indra/newview/llviewerkeyboard.cpp

indra/newview/llviewerkeyboard.h

indra/newview/llviewerwindow.cpp

indra/newview/llvoiceclient.cpp

indra/newview/llvoiceclient.h

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