Fixes #6095 from my side changed common template to add exception for action 2 and 16 (edit and view contact) only
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev