merge fix for STORM-582

indra/cmake/Python.cmake

indra/cmake/ViewerMiscLibs.cmake

indra/newview/llviewermessage.cpp

indra/newview/skins/default/xui/da/floater_bumps.xml

indra/newview/skins/default/xui/da/floater_pay.xml

indra/newview/skins/default/xui/da/floater_pay_object.xml

indra/newview/skins/default/xui/da/notifications.xml

indra/newview/skins/default/xui/da/strings.xml

indra/newview/skins/default/xui/de/notifications.xml

indra/newview/skins/default/xui/de/panel_edit_profile.xml

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

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

indra/newview/skins/default/xui/es/floater_im.xml

indra/newview/skins/default/xui/es/notifications.xml

indra/newview/skins/default/xui/fr/notifications.xml

indra/newview/skins/default/xui/fr/panel_edit_profile.xml

indra/newview/skins/default/xui/it/floater_bumps.xml

indra/newview/skins/default/xui/it/floater_pay.xml

indra/newview/skins/default/xui/it/floater_pay_object.xml

indra/newview/skins/default/xui/it/notifications.xml