Conflicts:
	python/tank/context.py
	python/tank/folder/folder_io.py
	python/tank/pipelineconfig.py