refs #1337 various minor tweaks for solr implementation
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev
fixes #8258 - email html view
Merge branch 'dev' into test
Merge branch 'test' into prod