Create categories.json file for migration
Sync with upstream develop
Merge branch 'develop'

Conflicts:
	docroot/sites/all/modules/osha_migration/data/categories.json
Added back taxonomy tags (prerequisite for other migrations)