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

Conflicts:
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/service/ComponentServiceImpl.java
Merge pull request #345 from gebagley/master

solr changes for transactions timing