LAC-85: Remove useless FileUploadFilter from web.xml
Merge remote-tracking branch 'origin/master'