Adjustments to match import process
Fix for validation
Merge branch 'master' of https://github.com/di2e/openstorefront

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

Conflicts:
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/service/manager/SolrManager.java
Merge branch 'master' of https://github.com/di2e/openstorefront
Merge pull request #320 from dshurt/master

Master