Merge pull request #596 from eric-wu/release-7

Rewire delete to go to trash can
Remove the unused ACLInheritanceException
Merge pull request #601 from eric-wu/release-7

a minor change I forgot to check in -- reorganizing imports