STORM-825 : update Merge from viewer-development

indra/llimage/CMakeLists.txt

indra/llimage/tests/llimageworker_test.cpp

indra/llimagej2coj/llimagej2coj.cpp

indra/llimagej2coj/llimagej2coj.h

indra/llkdu/CMakeLists.txt

indra/llkdu/llimagej2ckdu.cpp

indra/llkdu/llimagej2ckdu.h

indra/llkdu/tests/llimagej2ckdu_test.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/shaders/shader_hierarchy.txt

indra/newview/tests/llworldmap_test.cpp

indra/newview/tests/llworldmipmap_test.cpp