Misc. updates for new annotation storage
Reconciling tree(s) upload and supporting files

This will require some fixes to import-tree response JSON, but now we
can basically handle multi-tree uploads from a single file.
Handle supporting files tied to multiple trees.