fixes #7434 condition lock view link when no contactId
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev
refs #7354 retain deleted contact name for display
Merge branch 'dev' into test