refs #1337: solr adjustments
refs #1337: full text attachment UI tweaks
Merge branch 'dev' into test