Servlets can be async and multipart. Do the right thing for these.
Merge branch 'develop_2.9' into develop_2.10