merge changes for storm-1077

.hgtags

BuildParams

doc/contributions.txt

indra/integration_tests/CMakeLists.txt

indra/integration_tests/llimage_libtest/CMakeLists.txt

indra/integration_tests/llimage_libtest/llimage_libtest.cpp

indra/integration_tests/llimage_libtest/llimage_libtest.h

indra/linux_updater/linux_updater.cpp

indra/llcommon/llmetricperformancetester.cpp

indra/llcommon/llmetricperformancetester.h

indra/llcommon/llprocesslauncher.cpp

indra/llcommon/llversionviewer.h

indra/llimage/llimage.h

indra/llimage/llimagej2c.cpp

indra/llmath/v3math.h

indra/llplugin/llpluginprocessparent.cpp

indra/llui/lldockcontrol.cpp

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/llmenugl.cpp