Pass1
P2
RetryBatchSize==1
Retry on deletes
Fixes
Fix test
added filter
using interceptor model instead of a filter
Merge pull request #596 from eric-wu/release-7

Rewire delete to go to trash can
Merge pull request #597 from eric-wu/quickfix

Merge release-7 patch back into develop
Remove the unused ACLInheritanceException
more
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
Merge pull request #599 from xschildw/PLFM-2068

Plfm 2068
PLFM-1994: Query support for Annotations on SubmissionStatuses (RDS Worker not included)
Deletes on exception during ins/upd