solr search changes for articles and components
final changes to solr article searching
Merge branch 'master' of https://github.com/gebagley/openstorefront into gebagley-master

Conflicts:
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/service/AttributeServiceImpl.java
Merge branch 'gebagley-master'
Merge pull request #356 from Jedwondle/master

Merged Solr changes.