Bug 1029766 - Intermittent TEST-UNEXPECTED-FAIL | collection_test.js | Vertical - Collection drag icon (/w entry point) into collection r=crdlc

Conflicts:
	shared/test/integration/tbpl-manifest.json
	shared/test/integration/travis-manifest.json