(cherry picked from commit eb0311f3)

Conflicts:
	external_deps.lst
	scp2/source/ooo/file_library_ooo.scp
	solenv/bin/download_external_dependencies.pl
	ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
	ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
	ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx
	ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
	ucb/source/ucp/webdav/SerfSession.cxx

Change-Id: I6b9576226f86b87397bedc2b67a9289bc19317a7