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/gameengine/SceneGraph/SG_Spatial.cpp

@@ -161,8 +161,8 @@ RelativeTranslate(
 		}
 	}
 	SetModified();
-}	
-	
+}
+
 
 /**
  * Scaling methods.