Add config switch handler and help message forgotten in 54b5da69726a2333fbe8bef5e6569341845a7fbf, closes #1342 again
make class to use for file upload wrappers configurable, refs #1350
merge 9b86abc65eb42cd53f291fe98025b1307365e8b4 to 2e668530c9c3a1dcbb2b8d65b1391aef1a6ed59b (from 1.0)