Merging in additional files from master
Merge branch 'master' into hh5
Maintainging separate gemset
Matching up gemsets with master
DAM-252: Fixing rake:discovery task
DAM-252: Using solr-based search for public items
Merge branch 'hh5'