fixed async tests which fetch external resources
Merge remote-tracking branch 'origin/CDB-2929' into release/2.13.5

Conflicts:
	lib/assets/test/spec/cartodb/table/basemap_chooser_dialog.spec.js