Conflicts:
	Changelog
	snf-astakos-app/astakos/im/messages.py
	snf-pithos-app/pithos/api/manage_accounts/__init__.py
	snf-pithos-app/pithos/api/management/commands/reconcile-resources-pithos.py
	snf-pithos-app/pithos/api/settings.py
	snf-pithos-app/pithos/api/util.py
	snf-pithos-backend/pithos/backends/lib/sqlite/node.py
	version