Pass1
P2
RetryBatchSize==1
Retry on deletes
Fixes
Fix test
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
Merge pull request #592 from xschildw/PLFM-2068

Plfm 2068
Merge pull request #585 from xschildw/PLFM-1986

PLFM-1986
PLFM-1994: Query support for Annotations on SubmissionStatuses (RDS Worker not included)
WIP: code review changes
build fix
QueryDAOImplTests pass
handle null values, disallow null attributes
test cleanup, refactoring
wired up EvaluationController and new URL
renamed AnnotationsUtilsTest.java
updated integration test, waiting on worker