STORM-990 merge with current v-d & fixed merge conflict

doc/contributions.txt

indra/cmake/GoogleMock.cmake

indra/cmake/LLAddBuildTest.cmake

indra/cmake/run_build_test.py

indra/copy_win_scripts/start-client.py

indra/develop.py

indra/lib/python/indra/util/llperformance.py

indra/lib/python/indra/util/llversion.py

indra/lib/python/indra/util/simperf_proc_interface.py

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

indra/llmessage/tests/llhost_test.cpp

indra/llmessage/tests/test_llsdmessage_peer.py

indra/llmessage/tests/testrunner.py

indra/llrender/llvertexbuffer.cpp

indra/llrender/llvertexbuffer.h

indra/newview/app_settings/settings.xml

indra/newview/generate_breakpad_symbols.py

indra/newview/llavatarlist.cpp

indra/newview/llavatarlist.h

indra/newview/llrecentpeople.cpp