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