[Uploadable] Refactoring: extracting path resolve logic to separate method, few renames and phpdoc fixes
fixes #918 [Uploadable] Behaviour throws and exception when removing the entity and its file
Merge pull request #924 from tiger-seo/master

fixes #918