LUN-1295: trash file should check existance by file name not path
Merge pull request #36 from pbs/LUN-1295

LUN-1295: trash file should check existance by file name not path
LUN-1299:fixed IntegrityError when deleting owners for trashed folders
Merge pull request #37 from pbs/LUN-1299

LUN-1299:fixed IntegrityError when deleting owners for trashed folders
LUN-1303: folder A duplicate should exist if folder A is trashed
* fixed cmsroles related tests since modules location changed
Merge pull request #38 from pbs/LUN-1303

LUN-1303: folder A duplicate should exist if folder A is trashed
Merge branch 'master_pbs' into LUN-1258