Replace the trash folder path with trash folder id from StackConfiguration
Fix a trash manager test cleanup() bug