Clean up authorization manager and tests
PLFM-1725 Replace UnauthorizedException with NotFoundException for entities in the trash can
[PATCH] PR 594 from Develop (PLFM-1969: ACLs for Submissions)
Sync with 'upstream/release-7'
PLFM-2104 Make sure admin cannot get trashed entities directly
PLFM-2090 Rewire delete to go to trash can
Fix integ tests
Changes per code review feedback
Merge 'release-7' into develop
Merge pull request #597 from eric-wu/quickfix

Merge release-7 patch back into develop