annotations - fileupload response text/html

to make ext fileupload happy
Merge branch 'master' into integration