Merged changes in the trunk up to revision 50829.

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c

Also addressed code inconsistency due to changes in the trunk revision 50628 (color
management with OCIO) and 50806 (UV project material).  OCIO-related changes are marked
OCIO_TODO as in some other files modified in revision 50628.

source/blender/python/intern/CMakeLists.txt

@@ -72,6 +72,7 @@ set(SRC
 	bpy_app_handlers.h
 	bpy_driver.h
 	bpy_intern_string.h
+	bpy_library.h
 	bpy_operator.h
 	bpy_operator_wrap.h
 	bpy_props.h