Merge remote-tracking branch 'refs/remotes/origin/master-upstream' into feature/PYPE-597_avalon_upstream_attempt_2

# Conflicts:
#	avalon/maya/pipeline.py
#	avalon/nuke/__init__.py
#	avalon/nuke/lib.py
#	avalon/nuke/pipeline.py
#	avalon/pipeline.py
#	avalon/schema.py
#	avalon/tools/cbloader/__main__.py
#	avalon/tools/contextmanager/app.py
#	avalon/tools/creator/app.py
#	avalon/tools/delegates.py
#	avalon/tools/lib.py
#	avalon/tools/libraryloader/__init__.py
#	avalon/tools/libraryloader/__main__.py
#	avalon/tools/loader/app.py
#	avalon/tools/loader/widgets.py
#	avalon/tools/models.py
#	avalon/tools/projectmanager/app.py
#	avalon/tools/projectmanager/dialogs.py
#	avalon/tools/projectmanager/lib.py
#	avalon/tools/sceneinventory/model.py
#	avalon/tools/views.py
#	avalon/tools/widgets.py
#	avalon/tools/workfiles/app.py

Author: iLLiCiTiT