Add Upload2 support through the browser.

Minor refactoring of Upload1 to pull the URIs out into v1 and v2 files
to avoid cloning a bunch of .js files.