fixes #7494 export includes trashed contacts
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev