Merge pull request #364 from Jedwondle/master

The small client side changes required to get solr to work.
More container tests.
Merge branch 'master' of https://github.com/di2e/openstorefront

Conflicts:
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/service/AttributeServiceImpl.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/service/SearchServiceImpl.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/service/api/SearchService.java
Merge branch 'master' of https://github.com/di2e/openstorefront

Conflicts:
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/service/AttributeServiceImpl.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/service/SearchServiceImpl.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/service/api/SearchService.java
Merge pull request #365 from dshurt/master

Master
Modifications to scripts with latest code update (a lot of search issues fixed, OpenAM redirect loopback issue fixed removed code)
Merge pull request #366 from blaine-O/master

Minor updates for latest .war file
corrections for Solr searching with tags, attributes
Merge branch 'master' of https://github.com/di2e/openstorefront
Merge pull request #367 from gebagley/master

Solr changes for correction tags and attributes
Merge branch 'master' of https://github.com/di2e/openstorefront