Merge pull request #351 from blaine-O/master

Modifications to scripts with latest code update (a lot of search issues...
Added better watch support handling.
Merge branch 'master' of https://github.com/di2e/openstorefront
Merge pull request #352 from dshurt/master

Master
Added the attribute search.
Merge pull request #353 from Jedwondle/master

Added the attribute search.
solr search changes for articles and components
Added better watch support handling on sync
final changes to solr article searching
Merge pull request #354 from dshurt/master

Added better watch support handling on sync
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.
Added the correct information to the path.
Merge pull request #357 from Jedwondle/master

Added the correct information to the path.
Adding container tests.
Merge branch 'master' of https://github.com/di2e/openstorefront
Merge pull request #358 from dshurt/master

Master
solr changes
Merge branch 'master' of https://github.com/di2e/openstorefront