Merge pull request #399 from Jedwondle/master

Merge with master.
Got the script to update user profile and revert it saving it to work in User Tools
Merge pull request #400 from blaine-O/master

Got the script to update user profile and revert it saving it to work in...
Minor update to get it working again.
Merge pull request #401 from blaine-O/master

Minor update to get it working again.
Admin tools working on store-accept.  Working on search_Filters
Merge pull request #402 from blaine-O/master

Admin tools working on store-accept.  Working on search_Filters
Merge pull request #403 from Jedwondle/master

The Jira Mapping portion is complete!
Merge branch 'master' of https://github.com/di2e/openstorefront

Conflicts:
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/service/SystemServiceImpl.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/service/api/SystemService.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/resource/IntegrationResource.java
Merge branch 'master' of https://github.com/di2e/openstorefront
Merge pull request #404 from dshurt/master

STORE-230   High Article Content Indexing
Merge branch 'master' of https://github.com/di2e/openstorefront