fixes #7488 dedupe matching on 3rd party import
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev
refs #7474 additional tweak to activity report to fix display when filtering by logged in user
Merge branch 'dev' into test