SWC-1522: upload file bug
fix and add test
fix file handle servlet upload with existing file in container
add generation and fix test
Merge pull request #1057 from jay-hodgson/SWC-1522

Swc-1522: add new version of file to FileEntity if names match