merge changes for storm-1187

indra/cmake/Variables.cmake

indra/integration_tests/llimage_libtest/llimage_libtest.cpp

indra/llimage/llimage.cpp

indra/llimage/llimagej2c.cpp

indra/llimage/llimagej2c.h

indra/llimagej2coj/llimagej2coj.cpp

indra/llimagej2coj/llimagej2coj.h

indra/llkdu/llimagej2ckdu.cpp

indra/llkdu/llimagej2ckdu.h

indra/llkdu/llkdumem.cpp

indra/llkdu/llkdumem.h

indra/llui/llloadingindicator.cpp

indra/llui/llloadingindicator.h

indra/llui/llui.cpp

indra/llui/llui.h

indra/llui/lluiimage.cpp

indra/llui/lluiimage.h

indra/llui/tests/llurlentry_stub.cpp

indra/llui/tests/llurlentry_test.cpp

indra/llui/tests/llurlmatch_test.cpp