Replace the trash folder path with trash folder id from StackConfiguration
Fix a trash manager test cleanup() bug
Merge pull request #598 from eric-wu/develop

Fix test cleanup for the trash can autowired test