Clean imports
Merge branch 'test-cleanup' of https://github.com/whirm/tribler.git into
test-cleanup

Conflicts:
	Tribler/Test/API/test_seeding_live.py