Fix/test User.merge_to
Merge branch 'master' into organizations

Conflicts:
	src/sentry/models/user.py
Migration organization ownership
Protect against ownerless organizations