Merged in lindenlab/viewer-release

indra/llcommon/tests/llprocess_test.cpp

indra/llcommon/tests/llsdserialize_test.cpp

indra/llcommon/tests/wrapllerrs.h

indra/llimagej2coj/CMakeLists.txt

indra/llmessage/tests/commtest.h

indra/llmessage/tests/llhttpclient_test.cpp

indra/llplugin/slplugin/CMakeLists.txt

indra/llrender/llfontgl.cpp

indra/llui/llnotificationslistener.cpp

indra/llvfs/lldir.cpp

indra/llvfs/lldir_linux.cpp

indra/llvfs/lldir_mac.cpp

indra/llvfs/lldir_solaris.cpp

indra/llvfs/lldir_win32.cpp

indra/llwindow/llwindowmacosx.cpp

indra/llwindow/llwindowwin32.cpp

indra/llxml/tests/llcontrol_test.cpp

indra/media_plugins/base/CMakeLists.txt

indra/media_plugins/cef/CMakeLists.txt

indra/media_plugins/example/CMakeLists.txt