fixes #6723 pagecount
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev
fixing #7140
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev

* 'dev' of github.com:nysenate/Bluebird-CRM:
  fixes #6723 pagecount
  Added imap.activity.status.default parameter.
  Improved logging and threshold features for uA2.php
  refs #6845 remove parent clause from final job table reference as we want all job records
  refs #6440 report confirm on update
  refs #6845 addional mailing_job query
fixes #7109 handle trashed contacts
Merge branch 'dev' into test