merge changes for storm-1538

indra/integration_tests/llimage_libtest/llimage_libtest.cpp

indra/llcommon/lleventtimer.cpp

indra/llcommon/llfasttimer_class.cpp

indra/llcommon/llinstancetracker.h

indra/llcommon/tests/llinstancetracker_test.cpp

indra/llrender/llgl.cpp

indra/llui/CMakeLists.txt

indra/llui/llbadge.cpp

indra/llui/llbadge.h

indra/llui/llbadgeholder.cpp

indra/llui/llbadgeholder.h

indra/llui/llbadgeowner.cpp

indra/llui/llbadgeowner.h

indra/llui/llcombobox.cpp

indra/llui/llconsole.cpp

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/llfloaterreg.cpp

indra/llui/llfloaterreg.h

indra/llui/lllayoutstack.cpp