#2199 tweaks to work with new dojox.form.Uploader