merge changes for storm-812

doc/contributions.txt

indra/cmake/BerkeleyDB.cmake

indra/cmake/CMakeLists.txt

indra/cmake/FindJsonCpp.cmake

indra/cmake/FindLLQtWebkit.cmake

indra/cmake/FindNDOF.cmake

indra/cmake/FindTut.cmake

indra/cmake/FindZLIB.cmake

indra/cmake/LLAddBuildTest.cmake

indra/cmake/LLCommon.cmake

indra/cmake/LLPlugin.cmake

indra/cmake/NDOF.cmake

indra/cmake/Tut.cmake

indra/cmake/WebKitLibPlugin.cmake

indra/lib/python/indra/util/test_win32_manifest.py

indra/llimage/CMakeLists.txt

indra/llimage/tests/llimageworker_test.cpp

indra/llimagej2coj/llimagej2coj.cpp

indra/llimagej2coj/llimagej2coj.h

indra/llkdu/CMakeLists.txt